projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2de962 41431e1)
Merge pull request #7064 from DmtKats:pam
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Sep 2016 16:56:26 +0000 (16:56 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Sep 2016 16:56:27 +0000 (16:56 +0000)
1  2 
modules/imgcodecs/src/loadsave.cpp patch | diff1 | diff2 | blob | history
modules/imgcodecs/test/test_grfmt.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/imgcodecs/src/loadsave.cpp
Simple merge
diff --cc modules/imgcodecs/test/test_grfmt.cpp
Simple merge
Domain: Multimedia / Media Vision;