summaryrefslogtreecommitdiff
path: root/libc2dcolorconvert
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-10-09 18:10:25 -0700
committerLinux Build Service Account <lnxbuild@localhost>2017-10-09 18:10:25 -0700
commitc669e98c6cb1a08e22c7159dd7ae654261296a6a (patch)
treed5d28371441c96f43b836fac85e6b9eac2a94a36 /libc2dcolorconvert
parentd977261084980e0e8b196cdc87a6eeeeeca33fcd (diff)
parenta34d42348ca292f33ff732763705513b0a2de2e3 (diff)
downloadmedia-c669e98c6cb1a08e22c7159dd7ae654261296a6a.tar.gz
Merge a34d42348ca292f33ff732763705513b0a2de2e3 on remote branch
Change-Id: I8968235481b334aaf44757e2b65eb962710190b9
Diffstat (limited to 'libc2dcolorconvert')
-rw-r--r--libc2dcolorconvert/C2DColorConverter.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/libc2dcolorconvert/C2DColorConverter.cpp b/libc2dcolorconvert/C2DColorConverter.cpp
index 81cdade9..eb909494 100644
--- a/libc2dcolorconvert/C2DColorConverter.cpp
+++ b/libc2dcolorconvert/C2DColorConverter.cpp
@@ -109,16 +109,20 @@ C2DColorConverter::~C2DColorConverter()
mSrcSurface = 0;
}
- if (isYUVSurface(mSrcFormat)) {
- delete ((C2D_YUV_SURFACE_DEF *)mSrcSurfaceDef);
- } else {
- delete ((C2D_RGB_SURFACE_DEF *)mSrcSurfaceDef);
+ if (mSrcSurfaceDef) {
+ if (isYUVSurface(mSrcFormat)) {
+ delete ((C2D_YUV_SURFACE_DEF *)mSrcSurfaceDef);
+ } else {
+ delete ((C2D_RGB_SURFACE_DEF *)mSrcSurfaceDef);
+ }
}
- if (isYUVSurface(mDstFormat)) {
- delete ((C2D_YUV_SURFACE_DEF *)mDstSurfaceDef);
- } else {
- delete ((C2D_RGB_SURFACE_DEF *)mDstSurfaceDef);
+ if (mDstSurfaceDef) {
+ if (isYUVSurface(mDstFormat)) {
+ delete ((C2D_YUV_SURFACE_DEF *)mDstSurfaceDef);
+ } else {
+ delete ((C2D_RGB_SURFACE_DEF *)mDstSurfaceDef);
+ }
}
}