Fixed Windows build (MSVC 10 Win32)

internal CV_CAP_PROP_ZOOM is renamed to CV_CAP_PROP_ZOOM_DSHOW
internal CV_CAP_PROP_FOCUS is renamed to CV_CAP_PROP_FOCUS_DSHOW

modules/highgui/src/cap_dshow.cpp

@@ -2197,9 +2197,9 @@ enum { CV_CAP_PROP_SETTINGS = 28,
     CV_CAP_PROP_PAN,
     CV_CAP_PROP_TILT,
     CV_CAP_PROP_ROLL,
-	CV_CAP_PROP_ZOOM,	
+    CV_CAP_PROP_ZOOM_DSHOW,
     CV_CAP_PROP_IRIS,
-	CV_CAP_PROP_FOCUS 
+    CV_CAP_PROP_FOCUS_DSHOW
 };
 
 
@@ -2273,7 +2273,7 @@ int videoInput::getCameraPropertyFromCV(int cv_property){
         case CV_CAP_PROP_ROLL:
             return CameraControl_Roll;
 
-		case CV_CAP_PROP_ZOOM:
+        case CV_CAP_PROP_ZOOM_DSHOW:
             return CameraControl_Zoom;
 
         case CV_CAP_PROP_EXPOSURE:
@@ -2282,7 +2282,7 @@ int videoInput::getCameraPropertyFromCV(int cv_property){
         case CV_CAP_PROP_IRIS:
             return CameraControl_Iris;
 
-		case CV_CAP_PROP_FOCUS:
+        case CV_CAP_PROP_FOCUS_DSHOW:
             return CameraControl_Focus;
     }
     return -1;
@@ -3272,14 +3272,14 @@ double CvCaptureCAM_DShow::getProperty( int property_id )
     case CV_CAP_PROP_ROLL:
         if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
 
-	case CV_CAP_PROP_ZOOM:				
+    case CV_CAP_PROP_ZOOM_DSHOW:
         if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_BACKLIGHT),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
 
     case CV_CAP_PROP_IRIS:
         if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
 
-	case CV_CAP_PROP_FOCUS:				
-		if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; 
+    case CV_CAP_PROP_FOCUS_DSHOW:
+        if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS_DSHOW),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
 
     }
 
@@ -3391,8 +3391,8 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
     case  CV_CAP_PROP_ROLL:
         return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),(long)value);
 
-	case  CV_CAP_PROP_ZOOM:
-		return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ZOOM),(long)value);
+    case  CV_CAP_PROP_ZOOM_DSHOW:
+        return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ZOOM_DSHOW),(long)value);
 
     case  CV_CAP_PROP_EXPOSURE:
         return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_EXPOSURE),(long)value);
@@ -3400,8 +3400,8 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
     case  CV_CAP_PROP_IRIS:
         return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),(long)value);
 
-	case  CV_CAP_PROP_FOCUS:
-		return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS),(long)value);
+    case  CV_CAP_PROP_FOCUS_DSHOW:
+        return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS_DSHOW),(long)value);
     }