Merge lp:~zorba-coders/zorba/bug-1158052-image into lp:zorba/image-module
- bug-1158052-image
- Merge into image-module
Proposed by
Paul J. Lucas
| Status: | Merged |
|---|---|
| Merged at revision: | 57 |
| Proposed branch: | lp:~zorba-coders/zorba/bug-1158052-image |
| Merge into: | lp:zorba/image-module |
| Diff against target: |
381 lines (+41/-42) 4 files modified
src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp (+2/-2) src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp (+5/-6) src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp (+33/-33) src/com/zorba-xquery/www/modules/image/paint.xq.src/paint.cpp (+1/-1) |
| To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-1158052-image |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Hillery | Approve | ||
| Paul J. Lucas | Approve | ||
|
Review via email:
|
|||
Commit message
Corresponding changes for bug #1158052.
Description of the change
Corresponding changes for bug #1158052.
To post a comment you must log in.
Revision history for this message
| Paul J. Lucas (paul-lucas) : | # |
review:
Approve
Revision history for this message
| Chris Hillery (ceejatec) : | # |
review:
Approve
Revision history for this message
| Zorba Build Bot (zorba-buildbot) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp' | |||
| 2 | --- src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp 2011-10-06 08:18:47 +0000 | |||
| 3 | +++ src/com/zorba-xquery/www/modules/image/animation.xq.src/animation.cpp 2013-06-22 13:12:26 +0000 | |||
| 4 | @@ -56,7 +56,7 @@ | |||
| 5 | 56 | Magick::writeImages(lImageList.begin(), lImageList.end(), &lBlob, true); | 56 | Magick::writeImages(lImageList.begin(), lImageList.end(), &lBlob, true); |
| 6 | 57 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); | 57 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); |
| 7 | 58 | 58 | ||
| 9 | 59 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 59 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 10 | 60 | ImageFunction::checkIfItemIsNull(lItem); | 60 | ImageFunction::checkIfItemIsNull(lItem); |
| 11 | 61 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 61 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 12 | 62 | } | 62 | } |
| 13 | @@ -90,7 +90,7 @@ | |||
| 14 | 90 | Magick::writeImages(lImageList.begin(), lImageList.end(), &lBlob, true); | 90 | Magick::writeImages(lImageList.begin(), lImageList.end(), &lBlob, true); |
| 15 | 91 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); | 91 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); |
| 16 | 92 | 92 | ||
| 18 | 93 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 93 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 19 | 94 | ImageFunction::checkIfItemIsNull(lItem); | 94 | ImageFunction::checkIfItemIsNull(lItem); |
| 20 | 95 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 95 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 21 | 96 | } | 96 | } |
| 22 | 97 | 97 | ||
| 23 | === modified file 'src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp' | |||
| 24 | --- src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2013-06-12 05:12:20 +0000 | |||
| 25 | +++ src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2013-06-22 13:12:26 +0000 | |||
| 26 | @@ -119,7 +119,7 @@ | |||
| 27 | 119 | String lType = ImageFunction::getOneStringArg(aArgs, 1); | 119 | String lType = ImageFunction::getOneStringArg(aArgs, 1); |
| 28 | 120 | lImage.magick(lType.c_str()); | 120 | lImage.magick(lType.c_str()); |
| 29 | 121 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 121 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 31 | 122 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 122 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); |
| 32 | 123 | 123 | ||
| 33 | 124 | ImageFunction::checkIfItemIsNull(lItem); | 124 | ImageFunction::checkIfItemIsNull(lItem); |
| 34 | 125 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 125 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 35 | @@ -150,7 +150,7 @@ | |||
| 36 | 150 | 150 | ||
| 37 | 151 | lImage.magick(lType.c_str()); // Set output format | 151 | lImage.magick(lType.c_str()); // Set output format |
| 38 | 152 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 152 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 40 | 153 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 153 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 41 | 154 | 154 | ||
| 42 | 155 | ImageFunction::checkIfItemIsNull(lItem); | 155 | ImageFunction::checkIfItemIsNull(lItem); |
| 43 | 156 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 156 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 44 | @@ -182,7 +182,7 @@ | |||
| 45 | 182 | } | 182 | } |
| 46 | 183 | lImage.quality(lQuality); // Set output format | 183 | lImage.quality(lQuality); // Set output format |
| 47 | 184 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 184 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 49 | 185 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 185 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); |
| 50 | 186 | ImageFunction::checkIfItemIsNull(lItem); | 186 | ImageFunction::checkIfItemIsNull(lItem); |
| 51 | 187 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 187 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 52 | 188 | 188 | ||
| 53 | @@ -209,7 +209,7 @@ | |||
| 54 | 209 | lBlankImage.magick(lType.c_str()); // Set output format | 209 | lBlankImage.magick(lType.c_str()); // Set output format |
| 55 | 210 | 210 | ||
| 56 | 211 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lBlankImage); | 211 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lBlankImage); |
| 58 | 212 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 212 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); |
| 59 | 213 | ImageFunction::checkIfItemIsNull(lItem); | 213 | ImageFunction::checkIfItemIsNull(lItem); |
| 60 | 214 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 214 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 61 | 215 | 215 | ||
| 62 | @@ -285,5 +285,4 @@ | |||
| 63 | 285 | return new zorba::imagemodule::basicmodule::BasicModule(); | 285 | return new zorba::imagemodule::basicmodule::BasicModule(); |
| 64 | 286 | } | 286 | } |
| 65 | 287 | 287 | ||
| 68 | 288 | 288 | /* vim:set et sw=2 ts=2: */ | |
| 67 | 289 | |||
| 69 | 290 | 289 | ||
| 70 | === modified file 'src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp' | |||
| 71 | --- src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp 2011-10-06 08:18:47 +0000 | |||
| 72 | +++ src/com/zorba-xquery/www/modules/image/manipulation.xq.src/manipulation.cpp 2013-06-22 13:12:26 +0000 | |||
| 73 | @@ -42,7 +42,7 @@ | |||
| 74 | 42 | const unsigned int lNewHeight = ImageFunction::getOneUnsignedIntArg(aArgs, 2); | 42 | const unsigned int lNewHeight = ImageFunction::getOneUnsignedIntArg(aArgs, 2); |
| 75 | 43 | lImage.size(Magick::Geometry(lNewWidth, lNewHeight)); | 43 | lImage.size(Magick::Geometry(lNewWidth, lNewHeight)); |
| 76 | 44 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 44 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 78 | 45 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 45 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 79 | 46 | ImageFunction::checkIfItemIsNull(lItem); | 46 | ImageFunction::checkIfItemIsNull(lItem); |
| 80 | 47 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 47 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 81 | 48 | } | 48 | } |
| 82 | @@ -67,7 +67,7 @@ | |||
| 83 | 67 | const unsigned int lRatio = lNewWidth/lImage.columns(); | 67 | const unsigned int lRatio = lNewWidth/lImage.columns(); |
| 84 | 68 | lImage.zoom(Magick::Geometry(lNewWidth, lImage.rows()*lRatio)); | 68 | lImage.zoom(Magick::Geometry(lNewWidth, lImage.rows()*lRatio)); |
| 85 | 69 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 69 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 87 | 70 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 70 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); |
| 88 | 71 | ImageFunction::checkIfItemIsNull(lItem); | 71 | ImageFunction::checkIfItemIsNull(lItem); |
| 89 | 72 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 72 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 90 | 73 | 73 | ||
| 91 | @@ -94,7 +94,7 @@ | |||
| 92 | 94 | const unsigned int lRatio = lNewHeight / lImage.rows(); | 94 | const unsigned int lRatio = lNewHeight / lImage.rows(); |
| 93 | 95 | lImage.zoom(Magick::Geometry(lImage.columns()*lRatio, lNewHeight)); | 95 | lImage.zoom(Magick::Geometry(lImage.columns()*lRatio, lNewHeight)); |
| 94 | 96 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 96 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 96 | 97 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 97 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 97 | 98 | ImageFunction::checkIfItemIsNull(lItem); | 98 | ImageFunction::checkIfItemIsNull(lItem); |
| 98 | 99 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 99 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 99 | 100 | 100 | ||
| 100 | @@ -120,7 +120,7 @@ | |||
| 101 | 120 | const double lRatio = ImageFunction::getOneDoubleArg(aArgs, 1); | 120 | const double lRatio = ImageFunction::getOneDoubleArg(aArgs, 1); |
| 102 | 121 | lImage.zoom(Magick::Geometry(lImage.columns()*lRatio, lImage.rows()*lRatio)); | 121 | lImage.zoom(Magick::Geometry(lImage.columns()*lRatio, lImage.rows()*lRatio)); |
| 103 | 122 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 122 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 105 | 123 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 123 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 106 | 124 | ImageFunction::checkIfItemIsNull(lItem); | 124 | ImageFunction::checkIfItemIsNull(lItem); |
| 107 | 125 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 125 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 108 | 126 | } | 126 | } |
| 109 | @@ -149,7 +149,7 @@ | |||
| 110 | 149 | // crop away everything that is either right of lRightLowerX or below lRightLowerY | 149 | // crop away everything that is either right of lRightLowerX or below lRightLowerY |
| 111 | 150 | lImage.crop(Magick::Geometry(lWidth, lHeight)); | 150 | lImage.crop(Magick::Geometry(lWidth, lHeight)); |
| 112 | 151 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 151 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 114 | 152 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 152 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 115 | 153 | ImageFunction::checkIfItemIsNull(lItem); | 153 | ImageFunction::checkIfItemIsNull(lItem); |
| 116 | 154 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 154 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 117 | 155 | } | 155 | } |
| 118 | @@ -201,7 +201,7 @@ | |||
| 119 | 201 | lImage.composite(lOverlayImage, lLeftUpperX, lLeftUpperY, Magick::BumpmapCompositeOp); | 201 | lImage.composite(lOverlayImage, lLeftUpperX, lLeftUpperY, Magick::BumpmapCompositeOp); |
| 120 | 202 | } | 202 | } |
| 121 | 203 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 203 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 123 | 204 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 204 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 124 | 205 | ImageFunction::checkIfItemIsNull(lItem); | 205 | ImageFunction::checkIfItemIsNull(lItem); |
| 125 | 206 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 206 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 126 | 207 | } | 207 | } |
| 127 | @@ -227,7 +227,7 @@ | |||
| 128 | 227 | // chop away everything that is either left of lLeftUpperX or above lLeftUpperY | 227 | // chop away everything that is either left of lLeftUpperX or above lLeftUpperY |
| 129 | 228 | lImage.chop(Magick::Geometry(lLeftUpperX, lLeftUpperY)); | 228 | lImage.chop(Magick::Geometry(lLeftUpperX, lLeftUpperY)); |
| 130 | 229 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 229 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 132 | 230 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 230 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 133 | 231 | ImageFunction::checkIfItemIsNull(lItem); | 231 | ImageFunction::checkIfItemIsNull(lItem); |
| 134 | 232 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 232 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 135 | 233 | } | 233 | } |
| 136 | @@ -252,7 +252,7 @@ | |||
| 137 | 252 | // crop away everything that is either right of lRightLowerX or below lRightLowerY | 252 | // crop away everything that is either right of lRightLowerX or below lRightLowerY |
| 138 | 253 | lImage.crop(Magick::Geometry(lRightLowerX, lRightLowerY)); | 253 | lImage.crop(Magick::Geometry(lRightLowerX, lRightLowerY)); |
| 139 | 254 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 254 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 141 | 255 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 255 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 142 | 256 | ImageFunction::checkIfItemIsNull(lItem); | 256 | ImageFunction::checkIfItemIsNull(lItem); |
| 143 | 257 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 257 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 144 | 258 | } | 258 | } |
| 145 | @@ -274,7 +274,7 @@ | |||
| 146 | 274 | int lAngle = ImageFunction::getOneIntArg(aArgs, 1); | 274 | int lAngle = ImageFunction::getOneIntArg(aArgs, 1); |
| 147 | 275 | lImage.rotate(lAngle%360); | 275 | lImage.rotate(lAngle%360); |
| 148 | 276 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 276 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 150 | 277 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 277 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 151 | 278 | ImageFunction::checkIfItemIsNull(lItem); | 278 | ImageFunction::checkIfItemIsNull(lItem); |
| 152 | 279 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 279 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 153 | 280 | } | 280 | } |
| 154 | @@ -296,7 +296,7 @@ | |||
| 155 | 296 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 296 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 156 | 297 | lImage.erase(); | 297 | lImage.erase(); |
| 157 | 298 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 298 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 159 | 299 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 299 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 160 | 300 | ImageFunction::checkIfItemIsNull(lItem); | 300 | ImageFunction::checkIfItemIsNull(lItem); |
| 161 | 301 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 301 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 162 | 302 | } | 302 | } |
| 163 | @@ -318,7 +318,7 @@ | |||
| 164 | 318 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 318 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 165 | 319 | lImage.flop(); | 319 | lImage.flop(); |
| 166 | 320 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 320 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 168 | 321 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 321 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 169 | 322 | ImageFunction::checkIfItemIsNull(lItem); | 322 | ImageFunction::checkIfItemIsNull(lItem); |
| 170 | 323 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 323 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 171 | 324 | } | 324 | } |
| 172 | @@ -339,7 +339,7 @@ | |||
| 173 | 339 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 339 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 174 | 340 | lImage.flip(); | 340 | lImage.flip(); |
| 175 | 341 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 341 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 177 | 342 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 342 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 178 | 343 | ImageFunction::checkIfItemIsNull(lItem); | 343 | ImageFunction::checkIfItemIsNull(lItem); |
| 179 | 344 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 344 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 180 | 345 | } | 345 | } |
| 181 | @@ -360,7 +360,7 @@ | |||
| 182 | 360 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 360 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 183 | 361 | lImage.trim(); | 361 | lImage.trim(); |
| 184 | 362 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 362 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 186 | 363 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 363 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 187 | 364 | ImageFunction::checkIfItemIsNull(lItem); | 364 | ImageFunction::checkIfItemIsNull(lItem); |
| 188 | 365 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 365 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 189 | 366 | } | 366 | } |
| 190 | @@ -401,7 +401,7 @@ | |||
| 191 | 401 | } | 401 | } |
| 192 | 402 | 402 | ||
| 193 | 403 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 403 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 195 | 404 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 404 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 196 | 405 | ImageFunction::checkIfItemIsNull(lItem); | 405 | ImageFunction::checkIfItemIsNull(lItem); |
| 197 | 406 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 406 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 198 | 407 | } | 407 | } |
| 199 | @@ -426,7 +426,7 @@ | |||
| 200 | 426 | int lSigma = ImageFunction::getOneIntArg(aArgs, 2); | 426 | int lSigma = ImageFunction::getOneIntArg(aArgs, 2); |
| 201 | 427 | lImage.blur(lRadius, lSigma); | 427 | lImage.blur(lRadius, lSigma); |
| 202 | 428 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 428 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 204 | 429 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 429 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 205 | 430 | 430 | ||
| 206 | 431 | ImageFunction::checkIfItemIsNull(lItem); | 431 | ImageFunction::checkIfItemIsNull(lItem); |
| 207 | 432 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 432 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 208 | @@ -450,7 +450,7 @@ | |||
| 209 | 450 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 450 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 210 | 451 | lImage.despeckle(); | 451 | lImage.despeckle(); |
| 211 | 452 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 452 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 213 | 453 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 453 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 214 | 454 | ImageFunction::checkIfItemIsNull(lItem); | 454 | ImageFunction::checkIfItemIsNull(lItem); |
| 215 | 455 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 455 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 216 | 456 | } | 456 | } |
| 217 | @@ -471,7 +471,7 @@ | |||
| 218 | 471 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 471 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 219 | 472 | lImage.enhance(); | 472 | lImage.enhance(); |
| 220 | 473 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 473 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 222 | 474 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 474 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 223 | 475 | ImageFunction::checkIfItemIsNull(lItem); | 475 | ImageFunction::checkIfItemIsNull(lItem); |
| 224 | 476 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 476 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 225 | 477 | } | 477 | } |
| 226 | @@ -493,7 +493,7 @@ | |||
| 227 | 493 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 493 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 228 | 494 | lImage.equalize(); | 494 | lImage.equalize(); |
| 229 | 495 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 495 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 231 | 496 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 496 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 232 | 497 | ImageFunction::checkIfItemIsNull(lItem); | 497 | ImageFunction::checkIfItemIsNull(lItem); |
| 233 | 498 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 498 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 234 | 499 | } | 499 | } |
| 235 | @@ -513,11 +513,10 @@ | |||
| 236 | 513 | 513 | ||
| 237 | 514 | Magick::Image lImage; | 514 | Magick::Image lImage; |
| 238 | 515 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 515 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 239 | 516 | Item lItem; | ||
| 240 | 517 | // check if second argument was given | 516 | // check if second argument was given |
| 241 | 518 | lImage.edge(ImageFunction::getOneUnsignedIntArg(aArgs,1)); | 517 | lImage.edge(ImageFunction::getOneUnsignedIntArg(aArgs,1)); |
| 242 | 519 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 518 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 244 | 520 | lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 519 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 245 | 521 | ImageFunction::checkIfItemIsNull(lItem); | 520 | ImageFunction::checkIfItemIsNull(lItem); |
| 246 | 522 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 521 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 247 | 523 | } | 522 | } |
| 248 | @@ -541,7 +540,7 @@ | |||
| 249 | 541 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 540 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 250 | 542 | lImage.charcoal(lRadius, lSigma); | 541 | lImage.charcoal(lRadius, lSigma); |
| 251 | 543 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 542 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 253 | 544 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 543 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 254 | 545 | ImageFunction::checkIfItemIsNull(lItem); | 544 | ImageFunction::checkIfItemIsNull(lItem); |
| 255 | 546 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 545 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 256 | 547 | } | 546 | } |
| 257 | @@ -566,7 +565,7 @@ | |||
| 258 | 566 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 565 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 259 | 567 | lImage.emboss(lRadius, lSigma); | 566 | lImage.emboss(lRadius, lSigma); |
| 260 | 568 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 567 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 262 | 569 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 568 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 263 | 570 | ImageFunction::checkIfItemIsNull(lItem); | 569 | ImageFunction::checkIfItemIsNull(lItem); |
| 264 | 571 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 570 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 265 | 572 | } | 571 | } |
| 266 | @@ -590,7 +589,7 @@ | |||
| 267 | 590 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 589 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 268 | 591 | lImage.solarize(lFactor); | 590 | lImage.solarize(lFactor); |
| 269 | 592 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 591 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 271 | 593 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 592 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 272 | 594 | ImageFunction::checkIfItemIsNull(lItem); | 593 | ImageFunction::checkIfItemIsNull(lItem); |
| 273 | 595 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 594 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 274 | 596 | } | 595 | } |
| 275 | @@ -618,7 +617,7 @@ | |||
| 276 | 618 | } | 617 | } |
| 277 | 619 | lFirstImage.stereo(lSecondImage); | 618 | lFirstImage.stereo(lSecondImage); |
| 278 | 620 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lFirstImage); | 619 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lFirstImage); |
| 280 | 621 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 620 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 281 | 622 | ImageFunction::checkIfItemIsNull(lItem); | 621 | ImageFunction::checkIfItemIsNull(lItem); |
| 282 | 623 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 622 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 283 | 624 | } | 623 | } |
| 284 | @@ -653,7 +652,7 @@ | |||
| 285 | 653 | sscanf(lTmpString.substr(5,2).c_str(), "%x", &lBlue); | 652 | sscanf(lTmpString.substr(5,2).c_str(), "%x", &lBlue); |
| 286 | 654 | lImage.transparent(Magick::ColorRGB((double)lRed/255.0, (double)lGreen/255.0, (double)lBlue/255.0)); | 653 | lImage.transparent(Magick::ColorRGB((double)lRed/255.0, (double)lGreen/255.0, (double)lBlue/255.0)); |
| 287 | 655 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 654 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 289 | 656 | lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 655 | lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true); |
| 290 | 657 | ImageFunction::checkIfItemIsNull(lItem); | 656 | ImageFunction::checkIfItemIsNull(lItem); |
| 291 | 658 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 657 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 292 | 659 | } | 658 | } |
| 293 | @@ -676,7 +675,7 @@ | |||
| 294 | 676 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 675 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 295 | 677 | lImage.swirl(lDegrees); | 676 | lImage.swirl(lDegrees); |
| 296 | 678 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 677 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 298 | 679 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 678 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 299 | 680 | ImageFunction::checkIfItemIsNull(lItem); | 679 | ImageFunction::checkIfItemIsNull(lItem); |
| 300 | 681 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 680 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 301 | 682 | } | 681 | } |
| 302 | @@ -699,7 +698,7 @@ | |||
| 303 | 699 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 698 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 304 | 700 | lImage.reduceNoise(lOrder); | 699 | lImage.reduceNoise(lOrder); |
| 305 | 701 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 700 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 307 | 702 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 701 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 308 | 703 | ImageFunction::checkIfItemIsNull(lItem); | 702 | ImageFunction::checkIfItemIsNull(lItem); |
| 309 | 704 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 703 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 310 | 705 | } | 704 | } |
| 311 | @@ -723,7 +722,7 @@ | |||
| 312 | 723 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 722 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 313 | 724 | lImage.contrast(lSharpen); | 723 | lImage.contrast(lSharpen); |
| 314 | 725 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 724 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 316 | 726 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 725 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 317 | 727 | ImageFunction::checkIfItemIsNull(lItem); | 726 | ImageFunction::checkIfItemIsNull(lItem); |
| 318 | 728 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 727 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 319 | 729 | } | 728 | } |
| 320 | @@ -741,7 +740,6 @@ | |||
| 321 | 741 | const StaticContext* aSctxCtx, | 740 | const StaticContext* aSctxCtx, |
| 322 | 742 | const DynamicContext* aDynCtx) const | 741 | const DynamicContext* aDynCtx) const |
| 323 | 743 | { | 742 | { |
| 324 | 744 | Item lItem; | ||
| 325 | 745 | Magick::Image lImage; | 743 | Magick::Image lImage; |
| 326 | 746 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 744 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 327 | 747 | // check if the one gamma value version was called or the version with seperate values for r g and b. Doing this by looking if the 3. argument exists. | 745 | // check if the one gamma value version was called or the version with seperate values for r g and b. Doing this by looking if the 3. argument exists. |
| 328 | @@ -755,7 +753,7 @@ | |||
| 329 | 755 | lImage.gamma(lGamma); | 753 | lImage.gamma(lGamma); |
| 330 | 756 | } | 754 | } |
| 331 | 757 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 755 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 333 | 758 | lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 756 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 334 | 759 | ImageFunction::checkIfItemIsNull(lItem); | 757 | ImageFunction::checkIfItemIsNull(lItem); |
| 335 | 760 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 758 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 336 | 761 | } | 759 | } |
| 337 | @@ -778,7 +776,7 @@ | |||
| 338 | 778 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 776 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 339 | 779 | lImage.implode(lFactor); | 777 | lImage.implode(lFactor); |
| 340 | 780 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 778 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 342 | 781 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 779 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 343 | 782 | ImageFunction::checkIfItemIsNull(lItem); | 780 | ImageFunction::checkIfItemIsNull(lItem); |
| 344 | 783 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 781 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 345 | 784 | } | 782 | } |
| 346 | @@ -802,7 +800,7 @@ | |||
| 347 | 802 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); | 800 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage); |
| 348 | 803 | lImage.oilPaint(lRadius); | 801 | lImage.oilPaint(lRadius); |
| 349 | 804 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 802 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 351 | 805 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 803 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 352 | 806 | ImageFunction::checkIfItemIsNull(lItem); | 804 | ImageFunction::checkIfItemIsNull(lItem); |
| 353 | 807 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 805 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 354 | 808 | } | 806 | } |
| 355 | @@ -826,7 +824,7 @@ | |||
| 356 | 826 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 1, lImage); | 824 | ImageFunction::getOneImageArg(aDynCtx, aArgs, 1, lImage); |
| 357 | 827 | lImage.stegano(lWatermark); | 825 | lImage.stegano(lWatermark); |
| 358 | 828 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); | 826 | String lEncodedContent = ImageFunction::getEncodedStringFromImage(aDynCtx, lImage); |
| 360 | 829 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 827 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true) ); |
| 361 | 830 | ImageFunction::checkIfItemIsNull(lItem); | 828 | ImageFunction::checkIfItemIsNull(lItem); |
| 362 | 831 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 829 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 363 | 832 | } | 830 | } |
| 364 | @@ -847,3 +845,5 @@ | |||
| 365 | 847 | extern "C" DLL_EXPORT zorba::ExternalModule* createModule() { | 845 | extern "C" DLL_EXPORT zorba::ExternalModule* createModule() { |
| 366 | 848 | return new zorba::imagemodule::manipulationmodule::ManipulationModule(); | 846 | return new zorba::imagemodule::manipulationmodule::ManipulationModule(); |
| 367 | 849 | } | 847 | } |
| 368 | 848 | |||
| 369 | 849 | /* vim:set et sw=2 ts=2: */ | ||
| 370 | 850 | 850 | ||
| 371 | === modified file 'src/com/zorba-xquery/www/modules/image/paint.xq.src/paint.cpp' | |||
| 372 | --- src/com/zorba-xquery/www/modules/image/paint.xq.src/paint.cpp 2011-10-06 08:18:47 +0000 | |||
| 373 | +++ src/com/zorba-xquery/www/modules/image/paint.xq.src/paint.cpp 2013-06-22 13:12:26 +0000 | |||
| 374 | @@ -60,7 +60,7 @@ | |||
| 375 | 60 | 60 | ||
| 376 | 61 | // pass the blob back as base64Binary ... | 61 | // pass the blob back as base64Binary ... |
| 377 | 62 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); | 62 | String lEncodedContent = ImageFunction::getEncodedStringFromBlob(lBlob); |
| 379 | 63 | Item lItem = theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size()); | 63 | Item lItem( theModule->getItemFactory()->createBase64Binary(lEncodedContent.c_str(), lEncodedContent.size(), true)); |
| 380 | 64 | ImageFunction::checkIfItemIsNull(lItem); | 64 | ImageFunction::checkIfItemIsNull(lItem); |
| 381 | 65 | return ItemSequence_t(new SingletonItemSequence(lItem)); | 65 | return ItemSequence_t(new SingletonItemSequence(lItem)); |
| 382 | 66 | 66 | ||
Validation queue succeeded - proposal merged!