diff options
| author | Matioupi <Matioupi@users.noreply.github.com> | 2020-10-20 20:00:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 11:00:30 -0700 |
| commit | 30ada469ee7880de55f59e3a493eca55e045d8c0 (patch) | |
| tree | a4b6fa9c3761a662f79c2420331cbb119a7cfef7 | |
| parent | 02466202b2371054897cdb7e6c978062f9d4cb8f (diff) | |
| download | vcpkg-30ada469ee7880de55f59e3a493eca55e045d8c0.tar.gz vcpkg-30ada469ee7880de55f59e3a493eca55e045d8c0.zip | |
[opencv4] Fix build failure with some features (#14101)
| -rw-r--r-- | ports/opencv4/0006-jpeg2000_getref.patch | 33 | ||||
| -rw-r--r-- | ports/opencv4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/ports/opencv4/0006-jpeg2000_getref.patch b/ports/opencv4/0006-jpeg2000_getref.patch new file mode 100644 index 000000000..7b0fc09c0 --- /dev/null +++ b/ports/opencv4/0006-jpeg2000_getref.patch @@ -0,0 +1,33 @@ +diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+--- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp
++++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+@@ -375,13 +375,13 @@
+ int lshift = MAX(0, -rshift);
+ rshift = MAX(0, rshift);
+ int delta = (rshift > 0 ? 1 << (rshift - 1) : 0) + offset;
+
+ for( y = 0; y < yend - ystart; )
+ {
+- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
+ uchar* dst = data + (y - yoffset) * step - xoffset;
+
+ if( xstep == 1 )
+ {
+ if( maxval == 256 && offset == 0 )
+ for( x = 0; x < xend - xstart; x++ )
+@@ -441,13 +441,13 @@
+ int lshift = MAX(0, -rshift);
+ rshift = MAX(0, rshift);
+ int delta = (rshift > 0 ? 1 << (rshift - 1) : 0) + offset;
+
+ for( y = 0; y < yend - ystart; )
+ {
+- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 );
++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 );
+ ushort* dst = data + (y - yoffset) * step - xoffset;
+
+ if( xstep == 1 )
+ {
+ if( maxval == 65536 && offset == 0 )
+ for( x = 0; x < xend - xstart; x++ )
diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index f06945f44..c50302fa0 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,6 +1,6 @@ Source: opencv4 Version: 4.3.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: protobuf, zlib Homepage: https://github.com/opencv/opencv Description: computer vision library diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 49263ef9f..0b25bb1c8 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch + 0006-jpeg2000_getref.patch 0009-fix-uwp.patch ) |