r13964 by herm - Fix compiler error for older GraphicsMagick versions.

scribus-commit scribus-commit at lists.scribus.net
Sun Sep 6 02:00:15 CEST 2009


Revision: 13964
Author: herm
Date: 2009-09-06T00:00:35.622367Z
Commit message: Fix compiler error for older GraphicsMagick versions.


Changeset: 
M  /trunk/Scribus/scribus/scimgdataloader_gmagick.h
M  /trunk/Scribus/scribus/scimgdataloader_gmagick.cpp

Diffs:
Index: scribus/scimgdataloader_gmagick.h
===================================================================
--- scribus/scimgdataloader_gmagick.h	(revision 13963)
+++ scribus/scimgdataloader_gmagick.h	(revision 13964)
@@ -25,4 +25,5 @@
 	virtual bool useRawImage() { return m_useRawImage; }
 };
 
-#endif
\ No newline at end of file
+#endif
+
Index: scribus/scimgdataloader_gmagick.cpp
===================================================================
--- scribus/scimgdataloader_gmagick.cpp	(revision 13963)
+++ scribus/scimgdataloader_gmagick.cpp	(revision 13964)
@@ -14,6 +14,10 @@
 #include <Magick++.h>
 using namespace Magick;
 
+#ifndef ScaleQuantumToChar
+    #define MagickLib::ScaleQuantumToChar
+#endif
+
 static bool read_cmyk(Image *input, RawImage *output, int width, int height)
 {
 	/* Mapping:
@@ -213,4 +217,5 @@
 		return false;
 	}
 	return true;
-}
\ No newline at end of file
+}
+




More information about the scribus-commit mailing list