mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 11:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2021-06-08 05:04:57 +00:00
commit 1b5fe91624
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/videoio/src/cap_dshow.cpp
View File

@ -2503,7 +2503,10 @@ static void findClosestSizeAndSubtype(videoDevice * VD, int widthIn, int heightI
int tempH = 999999;
//Don't want to get stuck in a loop
if(stepX < 1 || stepY < 1) continue;
if(stepX < 1 || stepY < 1){
MyDeleteMediaType(pmtConfig);
continue;
}
//DebugPrintOut("min is %i %i max is %i %i - res is %i %i\n", scc.MinOutputSize.cx, scc.MinOutputSize.cy, scc.MaxOutputSize.cx, scc.MaxOutputSize.cy, stepX, stepY);
//DebugPrintOut("min frame duration is %i max duration is %i\n", scc.MinFrameInterval, scc.MaxFrameInterval);
@ -2619,7 +2622,8 @@ static bool setSizeAndSubtype(videoDevice * VD, int attemptWidth, int attemptHei
return true;
}else{
VD->streamConf->SetFormat(tmpType);
if( tmpType != NULL )MyDeleteMediaType(tmpType);
if( VD->pAmMediaType != NULL)MyDeleteMediaType(VD->pAmMediaType);
VD->pAmMediaType = tmpType;
}
return false;

4
samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs
View File

@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1
}
}
}
}
}

4
samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs
View File

@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1
}
}
}
}
}

4
samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs
View File

@ -207,7 +207,7 @@ namespace OpenCVXaml
catch
{
// If an exception is caught here it is most likely due to either
// ResourceLangauge not being correctly set to a supported language
// ResourceLanguage not being correctly set to a supported language
// code or ResourceFlowDirection is set to a value other than LeftToRight
// or RightToLeft.
@ -220,4 +220,4 @@ namespace OpenCVXaml
}
}
}
}
}