Changeset 6420

Timestamp:

Jul 1, 2016, 1:36:14 PM (8 years ago)

Author:

ldelgass

Message:

Merge r6419 from trunk (fix for building squeezer against Tk 8.5)

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/src/RpSqueezer.c (modified) (1 diff)

branches/blt4_trunk/gui/src/RpSqueezer.c

@@ -199 +199 @@
         }
     }
-    Tk_PhotoSetSize(NULL, destPhoto, destw, srch);
-    Tk_PhotoPutBlock(NULL, destPhoto, &destBlock, 0, 0,
+#if TK_MAJOR_VERSION > 8 || (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION > 4)
+    if (Tk_PhotoSetSize(interp, destPhoto, destw, srch) != TCL_OK) {
+        ckfree((char*)destBlock.pixelPtr);
+        return TCL_ERROR;
+    }
+    if (Tk_PhotoPutBlock(interp, destPhoto, &destBlock, 0, 0,
+                         destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET) != TCL_OK) {
+        ckfree((char*)destBlock.pixelPtr);
+        return TCL_ERROR;
+    }
+#else
+    Tk_PhotoSetSize(destPhoto, destw, srch);
+    Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0,
         destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET);
-
+#endif
     ckfree((char*)destBlock.pixelPtr);
     return TCL_OK;