| commit | ae08115d4db5a790ea517319aabfeca52a8da59c | [log] [tgz] |
|---|---|---|
| author | DRC <information@libjpeg-turbo.org> | Thu Oct 15 10:25:46 2020 -0500 |
| committer | DRC <information@libjpeg-turbo.org> | Thu Oct 15 10:25:46 2020 -0500 |
| tree | 47df0e1ecbdcfd683f387801616e6afa13a59f57 | |
| parent | 8789a5e2551bc5121544c1fee43a7e962c0b27c0 [diff] | |
| parent | b5a1472781b1beafaa459fc5a0e6b39bf79ed8f1 [diff] |
Merge branch 'master' into dev
diff --git a/ChangeLog.md b/ChangeLog.md index 89a6c68..5e3a375 100644 --- a/ChangeLog.md +++ b/ChangeLog.md
@@ -101,8 +101,8 @@ toolchains targetting ARM64 (AArch64) Windows binaries. 4. Fixed unexpected visual artifacts that occurred when using -`jpeg_crop_scanline()` and interblock smoothing while decompressing only the -DC scan of a progressive JPEG image. +`jpeg_crop_scanline()` and interblock smoothing while decompressing only the DC +scan of a progressive JPEG image. 2.0.5
diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake index 23426e3..f0d59fd 100644 --- a/cmakescripts/BuildPackages.cmake +++ b/cmakescripts/BuildPackages.cmake
@@ -45,19 +45,19 @@ configure_file(release/makerpm.in pkgscripts/makerpm) configure_file(release/rpm.spec.in pkgscripts/rpm.spec @ONLY) -add_custom_target(rpm sh pkgscripts/makerpm +add_custom_target(rpm pkgscripts/makerpm SOURCES pkgscripts/makerpm) configure_file(release/makesrpm.in pkgscripts/makesrpm) -add_custom_target(srpm sh pkgscripts/makesrpm +add_custom_target(srpm pkgscripts/makesrpm SOURCES pkgscripts/makesrpm DEPENDS dist) configure_file(release/makedpkg.in pkgscripts/makedpkg) configure_file(release/deb-control.in pkgscripts/deb-control) -add_custom_target(deb sh pkgscripts/makedpkg +add_custom_target(deb pkgscripts/makedpkg SOURCES pkgscripts/makedpkg) endif() # Linux @@ -132,7 +132,7 @@ configure_file(release/Welcome.rtf.in pkgscripts/Welcome.rtf) configure_file(release/uninstall.in pkgscripts/uninstall) -add_custom_target(dmg sh pkgscripts/makemacpkg +add_custom_target(dmg pkgscripts/makemacpkg SOURCES pkgscripts/makemacpkg) endif() # APPLE @@ -149,7 +149,7 @@ configure_file(release/maketarball.in pkgscripts/maketarball) -add_custom_target(tarball sh pkgscripts/maketarball +add_custom_target(tarball pkgscripts/maketarball SOURCES pkgscripts/maketarball) configure_file(release/libjpeg.pc.in pkgscripts/libjpeg.pc @ONLY)
diff --git a/release/License.rtf b/release/License.rtf old mode 100755 new mode 100644
diff --git a/release/Welcome.rtf.in b/release/Welcome.rtf.in old mode 100755 new mode 100644
diff --git a/release/installer.nsi.in b/release/installer.nsi.in old mode 100755 new mode 100644
diff --git a/release/makedpkg.in b/release/makedpkg.in old mode 100644 new mode 100755
diff --git a/release/makemacpkg.in b/release/makemacpkg.in old mode 100644 new mode 100755
diff --git a/release/makerpm.in b/release/makerpm.in old mode 100644 new mode 100755
diff --git a/release/makesrpm.in b/release/makesrpm.in old mode 100644 new mode 100755
diff --git a/release/maketarball.in b/release/maketarball.in old mode 100644 new mode 100755
diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt old mode 100755 new mode 100644
diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt old mode 100755 new mode 100644
diff --git a/turbojpeg-mapfile b/turbojpeg-mapfile old mode 100755 new mode 100644
diff --git a/turbojpeg-mapfile.jni b/turbojpeg-mapfile.jni old mode 100755 new mode 100644
diff --git a/win/jpeg62-memsrcdst.def b/win/jpeg62-memsrcdst.def old mode 100755 new mode 100644
diff --git a/win/jpeg62.def b/win/jpeg62.def old mode 100755 new mode 100644