Merge branch 'master' into dev

This commit is contained in:
DRC
2020-10-15 10:25:46 -05:00
16 changed files with 7 additions and 7 deletions

View File

@@ -101,8 +101,8 @@ skipping past the end of an image.
toolchains targetting ARM64 (AArch64) Windows binaries. toolchains targetting ARM64 (AArch64) Windows binaries.
4. Fixed unexpected visual artifacts that occurred when using 4. Fixed unexpected visual artifacts that occurred when using
`jpeg_crop_scanline()` and interblock smoothing while decompressing only the `jpeg_crop_scanline()` and interblock smoothing while decompressing only the DC
DC scan of a progressive JPEG image. scan of a progressive JPEG image.
2.0.5 2.0.5

View File

@@ -45,19 +45,19 @@ boolean_number(CMAKE_POSITION_INDEPENDENT_CODE)
configure_file(release/makerpm.in pkgscripts/makerpm) configure_file(release/makerpm.in pkgscripts/makerpm)
configure_file(release/rpm.spec.in pkgscripts/rpm.spec @ONLY) 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) SOURCES pkgscripts/makerpm)
configure_file(release/makesrpm.in pkgscripts/makesrpm) configure_file(release/makesrpm.in pkgscripts/makesrpm)
add_custom_target(srpm sh pkgscripts/makesrpm add_custom_target(srpm pkgscripts/makesrpm
SOURCES pkgscripts/makesrpm SOURCES pkgscripts/makesrpm
DEPENDS dist) DEPENDS dist)
configure_file(release/makedpkg.in pkgscripts/makedpkg) configure_file(release/makedpkg.in pkgscripts/makedpkg)
configure_file(release/deb-control.in pkgscripts/deb-control) 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) SOURCES pkgscripts/makedpkg)
endif() # Linux endif() # Linux
@@ -132,7 +132,7 @@ configure_file(release/Distribution.xml.in pkgscripts/Distribution.xml)
configure_file(release/Welcome.rtf.in pkgscripts/Welcome.rtf) configure_file(release/Welcome.rtf.in pkgscripts/Welcome.rtf)
configure_file(release/uninstall.in pkgscripts/uninstall) configure_file(release/uninstall.in pkgscripts/uninstall)
add_custom_target(dmg sh pkgscripts/makemacpkg add_custom_target(dmg pkgscripts/makemacpkg
SOURCES pkgscripts/makemacpkg) SOURCES pkgscripts/makemacpkg)
endif() # APPLE endif() # APPLE
@@ -149,7 +149,7 @@ add_custom_target(dist
configure_file(release/maketarball.in pkgscripts/maketarball) configure_file(release/maketarball.in pkgscripts/maketarball)
add_custom_target(tarball sh pkgscripts/maketarball add_custom_target(tarball pkgscripts/maketarball
SOURCES pkgscripts/maketarball) SOURCES pkgscripts/maketarball)
configure_file(release/libjpeg.pc.in pkgscripts/libjpeg.pc @ONLY) configure_file(release/libjpeg.pc.in pkgscripts/libjpeg.pc @ONLY)

0
release/License.rtf Executable file → Normal file
View File

0
release/Welcome.rtf.in Executable file → Normal file
View File

0
release/installer.nsi.in Executable file → Normal file
View File

0
release/makedpkg.in Normal file → Executable file
View File

0
release/makemacpkg.in Normal file → Executable file
View File

0
release/makerpm.in Normal file → Executable file
View File

0
release/makesrpm.in Normal file → Executable file
View File

0
release/maketarball.in Normal file → Executable file
View File

0
sharedlib/CMakeLists.txt Executable file → Normal file
View File

0
simd/CMakeLists.txt Executable file → Normal file
View File

0
turbojpeg-mapfile Executable file → Normal file
View File

0
turbojpeg-mapfile.jni Executable file → Normal file
View File

0
win/jpeg62-memsrcdst.def Executable file → Normal file
View File

0
win/jpeg62.def Executable file → Normal file
View File