Author: jghali
Date: Sun Jan 23 14:07:59 2022
New Revision: 24820
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24820
Log:
Modify ScImageFormatType::IMAGESIMGFRAME to indicate that WPG files can also be
loaded in image frames
Modified:
trunk/Scribus/scribus/util_formats.cpp
trunk/Scribus/scribus/util_formats.h
Modified: trunk/Scribus/scribus/util_formats.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24820&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp (original)
+++ trunk/Scribus/scribus/util_formats.cpp Sun Jan 23 14:07:59 2022
@@ -410,6 +410,8 @@
ret = "psd";
else if (((buf[0] == 'I') && (buf[1] == 'I') && (buf[2] == '\x2A')) ||
((buf[0] == 'M') && (buf[1] == 'M') && (buf[3] == '\x2A')))
ret = "tif";
+ else if ((buf[0] == '\xff') && (buf[1] == 'W') && (buf[2] == 'P') &&
(buf[3] == 'C'))
+ ret = "wpg";
else if ((buf[0] == '/') && (buf[1] == '*') && (buf[2] == ' ') &&
(buf[3] == 'X') && (buf[4] == 'P') && (buf[5] == 'M'))
ret = "xpm";
else if ((buf[0] == 'V') && (buf[1] == 'C') && (buf[2] == 'L') &&
(buf[3] == 'M') && (buf[4] == 'T') && (buf[5] == 'F'))
Modified: trunk/Scribus/scribus/util_formats.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24820&path=/trunk/Scribus/scribus/util_formats.h
==============================================================================
--- trunk/Scribus/scribus/util_formats.h (original)
+++ trunk/Scribus/scribus/util_formats.h Sun Jan 23 14:07:59 2022
@@ -40,9 +40,9 @@
{
ALLIMAGES =
1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192|16384|32768|524288|1048576|2097152|4194304|8388608,
#ifdef GMAGICK_FOUND
- IMAGESIMGFRAME =
1|2|4|16|32|64|128|256|512|65536|1048576|2097152|4194304|8388608, // all Types
suitable for Image Frames
+ IMAGESIMGFRAME =
1|2|4|16|32|64|128|256|512|32768|65536|1048576|2097152|4194304|8388608, // all
Types suitable for Image Frames
#else
- IMAGESIMGFRAME =
1|2|4|16|32|64|128|256|512|262144|524288|1048576|2097152|4194304|8388608, //
all Types suitable for Image Frames
+ IMAGESIMGFRAME =
1|2|4|16|32|64|128|256|512|32768|262144|524288|1048576|2097152|4194304|8388608,
// all Types suitable for Image Frames
#endif
VECTORIMAGES =
1|64|1024|2048|16384|32768|131072|262144|4194304, // All pure vector image
types
RASTORIMAGES =
2|4|8|32|128|256|512|65536|524288|1048576|2097152|8388608, // All pure rastor
image types
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
