Changeset 760 for trunk

Timestamp:

Apr 27, 2016, 12:43:47 PM (9 years ago)

Author:

djay

Message:

Fix issue reported by Alex in the Saga support.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal_ms.c (modified) (2 diffs)
• service_internal_saga.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -669 +669 @@
     if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
       return -1;
-#if MS_VERSION_MAJOR<7
-    myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
-#endif
     if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
       return -1;
@@ -920 +917 @@
             if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
               return -1;
-#if MS_VERSION_MAJOR<7
-            myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
-#endif
             if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
               return -1;

trunk/zoo-project/zoo-kernel/service_internal_saga.c

@@ -443 +443 @@
                   for(int i=0; i<param->asList()->Get_Count(); i++)
                     {
-                      fileNames[i].Trim();
                       if( i < nFileNames )
                         {