Merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module

[Rodolfo Ochoa]

test fixed

test fixed

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867693-2012-09-27T00-32-40.523Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug867693-2012-09-27T00-32-40.523Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867693-2012-10-17T23-00-39.162Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug867693-2012-10-17T23-00-39.162Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/com/zorba-xquery/www/modules/image/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/image/CMakeLists.txt	2012-07-20 20:26:02 +0000
+++ src/com/zorba-xquery/www/modules/image/CMakeLists.txt	2012-09-27 00:29:24 +0000
@@ -48,12 +48,10 @@
       EXTRA_SOURCES image_commons
       LINK_LIBRARIES ${ImageMagick_LIBRARIES})
 
+    # this could crash because of the ImageMagick version
+    # must be compiled in debug mode
     SET (KNOWN_CRASHES)
     IF (WIN32)
-      LIST (APPEND KNOWN_CRASHES
-        zorba_image_module/image/basic_svg.xq 867693
-      )
-
       IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
         LIST (APPEND KNOWN_CRASHES
           zorba_image_module/image/basic.xq 867693

=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp	2012-08-15 21:26:45 +0000
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp	2012-09-27 00:29:24 +0000
@@ -55,9 +55,7 @@
   // constuct error QName
   String lNamespace = "http://www.zorba-xquery.com/modules/image/error";
   String lLocalname = "IM001";
-  Item lQName;
-  Iterator_t lDummyIterator;
-  aDynamicContext->getVariable(lNamespace, lLocalname, lQName, lDummyIterator); 
+  Item lQName = ImageModule::getItemFactory()->createQName(lNamespace, "image", lLocalname);
   // if we have zero length image, then tell the user so
   if (std::string(aMessage).find("zero-length") != std::string::npos) {
     lErrorMessage << "The passed xs:base64Binary seems to be empty.";
@@ -71,9 +69,7 @@
 void 
 ImageFunction::throwErrorWithQName (const DynamicContext* aDynamicContext, const String& aLocalName, const String& aMessage) {
    String lNamespace = "http://www.zorba-xquery.com/modules/image/error";
-   Item lQName;
-   Iterator_t lDummyIterator;
-   aDynamicContext->getVariable(lNamespace, aLocalName, lQName, lDummyIterator);
+   Item lQName = ImageModule::getItemFactory()->createQName(lNamespace, "image", aLocalName);
    USER_EXCEPTION(lQName, aMessage); 
 }