]> git.pld-linux.org Git - packages/virtuoso.git/blame - imagemagick7.patch
projects / packages / virtuoso.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- drop deprecated calls from ImageMagick module
[packages/virtuoso.git] / imagemagick7.patch
CommitLineData
a70eceec
JR		 1--- virtuoso-opensource-7.2.1/configure.in.orig 2016-12-21 09:10:29.000000000 +0100
2+++ virtuoso-opensource-7.2.1/configure.in 2016-12-21 09:18:19.783118520 +0100
3@@ -1335,7 +1335,7 @@
4
5 if test "x$with_im" != "xno"
6 then
7- AC_PATH_PROG(IM_CONFIG, Wand-config, notfound, ["$with_im/bin:$PATH"])
8+ AC_PATH_PROG(IM_CONFIG, MagickWand-config, notfound, ["$with_im/bin:$PATH"])
9
10 if test "x$IM_CONFIG" = "xnotfound"
11 then
12@@ -1367,7 +1367,7 @@
13 #include <stdlib.h>
14 #include <string.h>
15 #include <time.h>
16-#include <wand/magick-wand.h>
17+#include <MagickWand/MagickWand.h>
18 MagickWand *magick_wand;
19 int
20 main ()
21--- virtuoso-opensource-7.2.1/binsrc/samples/image_magick/im.c~ 2015-03-12 03:09:01.000000000 +0100
22+++ virtuoso-opensource-7.2.1/binsrc/samples/image_magick/im.c 2016-12-21 09:20:43.071615860 +0100
23@@ -37,7 +37,7 @@
24 #include <string.h>
25 #include <time.h>
26
27-#include <wand/magick-wand.h>
28+#include <MagickWand/MagickWand.h>
29
30 #define IM_VERSION "0.6"
31
cb721c58
JR		 32@@ -310,7 +310,6 @@
33 {
34 switch (op)
35 {
36- case 'A': strg_value = MagickGetImageAttribute (env.ime_magick_wand, key); break;
37 case 'F': strg_value = MagickGetImageFormat (env.ime_magick_wand); break;
38 case 'I': strg_value = MagickIdentifyImage (env.ime_magick_wand); break;
39 case 'W': ul_value = MagickGetImageWidth (env.ime_magick_wand); break;
40@@ -347,9 +346,6 @@
41 return res;
42 }
43
44-caddr_t
45-bif_im_GetImageFileAttribute(caddr_t * qst, caddr_t * err, state_slot_t ** args)
46-{ return bif_im_get_impl (qst, err, args, 1, 'A', "IM GetImageFileAttribute"); }
47 caddr_t bif_im_GetImageFileFormat(caddr_t * qst, caddr_t * err, state_slot_t ** args)
48 { return bif_im_get_impl (qst, err, args, 1, 'F', "IM GetImageFileFormat"); }
49 caddr_t bif_im_GetImageFileIdentify(caddr_t * qst, caddr_t * err, state_slot_t ** args)
50@@ -362,8 +358,6 @@
51 { return bif_im_get_impl (qst, err, args, 1, 'H', "IM GetImageFileHeight"); }
52 caddr_t bif_im_GetImageFileWH(caddr_t * qst, caddr_t * err, state_slot_t ** args)
53 { return bif_im_get_impl (qst, err, args, 1, '2', "IM GetImageFileWH"); }
54-caddr_t bif_im_GetImageBlobAttribute(caddr_t * qst, caddr_t * err, state_slot_t ** args)
55-{ return bif_im_get_impl (qst, err, args, 0, 'A', "IM GetImageBlobAttribute"); }
56 caddr_t bif_im_GetImageBlobFormat(caddr_t * qst, caddr_t * err, state_slot_t ** args)
57 { return bif_im_get_impl (qst, err, args, 0, 'F', "IM GetImageBlobFormat"); }
58 caddr_t bif_im_GetImageBlobIdentify(caddr_t * qst, caddr_t * err, state_slot_t ** args)
59@@ -409,7 +403,6 @@
60 long y = bif_long_arg (qst, args, 5, "IM CropAndResizeImageBlob");
61 long h_size = bif_long_arg (qst, args, 6, "IM ResizeImageBlob");
62 long v_size = bif_long_arg (qst, args, 7, "IM ResizeImageBlob");
63- double blur = bif_double_arg (qst, args, 8, "IM ResizeImageBlob");
64 long filter = bif_long_arg (qst, args, 9, "IM ResizeImageBlob");
65 if (filter < 0 || filter > 15)
66 filter = PointFilter;
67@@ -421,7 +414,7 @@
68 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
69 {
70 MagickCropImage (env.ime_magick_wand, width, height, x, y);
71- MagickResizeImage (env.ime_magick_wand, h_size, v_size, filter, blur);
72+ MagickResizeImage (env.ime_magick_wand, h_size, v_size, filter);
73 }
74 res = im_write (&env);
75 im_leave (&env);
76@@ -490,7 +483,6 @@
77 im_env_t env;
78 double v_size = bif_double_arg (qst, args, 1, "IM ResampleImageFile");
79 double h_size = bif_double_arg (qst, args, 2, "IM ResampleImageFile");
80- double blur = bif_double_arg (qst, args, 3, "IM ResampleImageFile");
81 long filter = bif_long_arg (qst, args, 4, "IM ResampleImageFile");
82 if (filter < 0 || filter > 15)
83 filter = PointFilter;
84@@ -500,7 +492,7 @@
85 MagickResetIterator (env.ime_magick_wand);
86 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
87 {
88- MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter,blur);
89+ MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter);
90 }
91 im_write (&env);
92 im_leave (&env);
93@@ -513,7 +505,6 @@
94 caddr_t res;
95 double v_size = bif_double_arg (qst, args, 1, "IM ResampleImageFileToBlob");
96 double h_size = bif_double_arg (qst, args, 2, "IM ResampleImageFileToBlob");
97- double blur = bif_double_arg (qst, args, 3, "IM ResampleImageFileToBlob");
98 long filter = bif_long_arg (qst, args, 4, "IM ResampleImageFileToBlob");
99 if (filter < 0 || filter > 15)
100 filter = PointFilter;
101@@ -523,7 +514,7 @@
102 MagickResetIterator (env.ime_magick_wand);
103 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
104 {
105- MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter,blur);
106+ MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter);
107 }
108 res = im_write (&env);
109 im_leave (&env);
110@@ -536,7 +527,6 @@
111 caddr_t res;
112 double v_size = bif_double_arg (qst, args, 2, "IM ResampleImageBlob");
113 double h_size = bif_double_arg (qst, args, 3, "IM ResampleImageBlob");
114- double blur = bif_double_arg (qst, args, 4, "IM ResampleImageBlob");
115 long filter = bif_long_arg (qst, args, 5, "IM ResampleImageBlob");
116 if (filter < 0 || filter > 15)
117 filter = PointFilter;
118@@ -547,7 +537,7 @@
119 MagickResetIterator (env.ime_magick_wand);
120 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
121 {
122- MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter,blur);
123+ MagickResampleImage (env.ime_magick_wand,v_size, h_size,filter);
124 }
125 res = im_write (&env);
126 im_leave (&env);
127@@ -560,7 +550,6 @@
128 im_env_t env;
129 long v_size = bif_long_arg (qst, args, 1, "IM ResizeImageFile");
130 long h_size = bif_long_arg (qst, args, 2, "IM ResizeImageFile");
131- double blur = bif_double_arg (qst, args, 3, "IM ResizeImageFile");
132 long filter = bif_long_arg (qst, args, 4, "IM ResizeImageFile");
133 if (filter < 0 || filter > 15)
134 filter = PointFilter;
135@@ -570,7 +559,7 @@
136 MagickResetIterator (env.ime_magick_wand);
137 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
138 {
139- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,blur);
140+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
141 }
142 im_write (&env);
143 im_leave (&env);
144@@ -583,7 +572,6 @@
145 caddr_t res;
146 long v_size = bif_long_arg (qst, args, 1, "IM ResizeImageFileToBlob");
147 long h_size = bif_long_arg (qst, args, 2, "IM ResizeImageFileToBlob");
148- double blur = bif_double_arg (qst, args, 3, "IM ResizeImageFileToBlob");
149 long filter = bif_long_arg (qst, args, 4, "IM ResizeImageFileToBlob");
150 if (filter < 0 || filter > 15)
151 filter = PointFilter;
152@@ -593,7 +581,7 @@
153 MagickResetIterator (env.ime_magick_wand);
154 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
155 {
156- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,blur);
157+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
158 }
159 res = im_write (&env);
160 im_leave (&env);
161@@ -606,7 +594,6 @@
162 caddr_t res;
163 long v_size = bif_long_arg (qst, args, 2, "IM ResizeImageBlob");
164 long h_size = bif_long_arg (qst, args, 3, "IM ResizeImageBlob");
165- double blur = bif_double_arg (qst, args, 4, "IM ResizeImageBlob");
166 long filter = bif_long_arg (qst, args, 5, "IM ResizeImageBlob");
167 if (filter < 0 || filter > 15)
168 filter = PointFilter;
169@@ -617,7 +604,7 @@
170 MagickResetIterator (env.ime_magick_wand);
171 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
172 {
173- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,blur);
174+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
175 }
176 res = im_write (&env);
177 im_leave (&env);
178@@ -636,7 +623,7 @@
179 MagickResetIterator (env.ime_magick_wand);
180 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
181 {
182- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,1.0);
183+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
184 MagickProfileImage (env.ime_magick_wand, "*", NULL, 0);
185 }
186 im_write (&env);
187@@ -659,7 +646,7 @@
188 MagickResetIterator (env.ime_magick_wand);
189 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
190 {
191- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,1.0);
192+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
193 MagickProfileImage (env.ime_magick_wand, "*", NULL, 0);
194 }
195 res = im_write (&env);
196@@ -683,7 +670,7 @@
197 MagickResetIterator (env.ime_magick_wand);
198 while (MagickNextImage (env.ime_magick_wand) != MagickFalse)
199 {
200- MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter,1.0);
201+ MagickResizeImage (env.ime_magick_wand,v_size, h_size,filter);
202 MagickProfileImage (env.ime_magick_wand, "*", NULL, 0);
203 }
204 res = im_write (&env);
205@@ -734,8 +721,8 @@
206 v_size = MagickGetImageHeight (env.ime_magick_wand);
207 if ((256 < h_size) || (256 < v_size))
208 continue;
209- MagickResizeImage (env.ime_magick_wand, h_size/2, v_size/2, BoxFilter, 1.0);
210- if (MagickFalse == MagickCompositeImage (env.ime_target_magick_wand, env.ime_magick_wand, OverCompositeOp, (image_ctr & 1) * 128, (image_ctr & 2) * 64))
211+ MagickResizeImage (env.ime_magick_wand, h_size/2, v_size/2, BoxFilter);
212+ if (MagickFalse == MagickCompositeImage (env.ime_target_magick_wand, env.ime_magick_wand, OverCompositeOp, MagickTrue, (image_ctr & 1) * 128, (image_ctr & 2) * 64))
213 im_leave_with_error (&env, "22023", "IM001", "Can not composite image");
214 }
215 im_reset_read (&env);
216@@ -893,7 +880,6 @@
217 bif_define ("IM ResampleImageFile", bif_im_ResampleImageFile);
218 bif_define ("IM RotateImageFile", bif_im_RotateImageFile);
219 bif_define ("IM CropImageFile", bif_im_CropImageFile);
220- bif_define ("IM GetImageFileAttribute", bif_im_GetImageFileAttribute);
221 bif_define ("IM GetImageFileFormat", bif_im_GetImageFileFormat);
222 bif_define ("IM GetImageFileIdentify", bif_im_GetImageFileIdentify);
223 bif_define ("IM GetImageBlobIdentify", bif_im_GetImageBlobIdentify);
224@@ -908,7 +894,6 @@
225 bif_define ("IM ResampleImageFileToBlob", bif_im_ResampleImageFileToBlob);
226 bif_define ("IM RotateImageFileToBlob", bif_im_RotateImageFileToBlob);
227 bif_define ("IM CropImageFileToBlob", bif_im_CropImageFileToBlob);
228- bif_define ("IM GetImageBlobAttribute", bif_im_GetImageBlobAttribute);
229 bif_define ("IM GetImageBlobFormat", bif_im_GetImageBlobFormat);
230 bif_define ("IM GetImageBlobWidth", bif_im_GetImageBlobWidth);
231 bif_define ("IM GetImageBlobHeight", bif_im_GetImageBlobHeight);
OpenLink Virtuoso Database System
This page took 0.085696 seconds and 4 git commands to generate.