Changeset 6419

Timestamp:

Jul 1, 2016, 1:34:31 PM (8 years ago)

Author:

ldelgass

Message:

Make squeezer build with Tk 8.5 (as well as Tk 8.4)

File:

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

trunk/gui/src/RpSqueezer.c

@@ -199 +199 @@
         }
     }
+#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;