Merge branch 'develop' of https://github.com/MapWindow/MapWinGIS into develop

Author: jerryfaust

src/COM classes/ShapefileCategories.cpp

@@ -617,11 +617,11 @@ void CShapefileCategories::ApplyExpressionCore(long CategoryIndex, long startRow
     //		Saving results
     // -------------------------------------------------------------
     for (unsigned long i = 0; i < results.size(); i++) {
-        // Is this a category we need?
-        if (!allCategories && i != CategoryIndex)
+		// Is this a category we need?
+		const int categoryIndex = results[i];
+		if (!allCategories && categoryIndex != CategoryIndex)
             continue;
 
-		const int categoryIndex = results[i];
 		const int rowIndex = startRowIndex + i;
         _shapefile->put_ShapeCategory(rowIndex, categoryIndex);
         _shapefile->put_ShapeRotation(rowIndex, rotations[categoryIndex + 1][i]);

src/MapWinGIS.idl

@@ -6918,6 +6918,7 @@ library MapWinGIS
 
             [id(48)] IDispatch* GetColorScheme(long LayerHandle);
 			[id(92)] VARIANT_BOOL SetImageLayerColorScheme(LONG LayerHandle, IDispatch* ColorScheme);
+			[id(143)] void ReSourceLayer(long LayerHandle, BSTR newSrcPath);
 
             [id(263)] VARIANT_BOOL ReloadOgrLayerFromSource(long OgrLayerHandle);
 			[id(264)] void RestartBackgroundLoading(long OgrLayerHandle);