Skip to content

Commit

Permalink
Remove support for Visual Studio 2015
Browse files Browse the repository at this point in the history
As Visual Studio 2017 is available, it doesn't makes sense to include support for 2015. VS 2017 has much better support for C++14 then VS  2015.
  • Loading branch information
vbaderks committed Oct 3, 2017
1 parent 0788c2a commit 44004d1
Show file tree
Hide file tree
Showing 29 changed files with 43 additions and 2,628 deletions.
12 changes: 6 additions & 6 deletions CharLS_VS2017.sln → CharLS.sln
Expand Up @@ -3,31 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSTest_VS2017", "test\CharLSTest_VS2017.vcxproj", "{7185AD7F-57BA-42C7-A715-239CEA8ADC31}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSTest", "test\CharLSTest.vcxproj", "{7185AD7F-57BA-42C7-A715-239CEA8ADC31}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{BE733144-010D-4F7F-A619-0B73D8461D60}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{1C1CF63C-A53A-449F-90D3-63321015FD65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{A81B52AC-655D-4D1F-B21B-9BC4529AB447}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLS_VS2017", "src\CharLS_VS2017.vcxproj", "{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLS", "src\CharLS.vcxproj", "{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5F4C6204-36F8-4D63-BF33-ECFCB5D1D114}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNet_VS2017", "net\CharLSNet_VS2017.csproj", "{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNet", "net\CharLSNet.csproj", "{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNetTest_VS2017", "nettest\CharLSNetTest_VS2017.csproj", "{002B897F-9D96-4A99-853F-53806C39559D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNetTest", "nettest\CharLSNetTest.csproj", "{002B897F-9D96-4A99-853F-53806C39559D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert_VS2017", "samples\convert.c\Convert_VS2017.vcxproj", "{F42C0547-FEB3-40F4-9379-0FF87B44FA0F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "samples\convert.c\Convert.vcxproj", "{F42C0547-FEB3-40F4-9379-0FF87B44FA0F}"
ProjectSection(ProjectDependencies) = postProject
{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C} = {1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSUnitTest_VS2017", "unittest\CharLSUnitTest_VS2017.vcxproj", "{4A912445-1E83-41FA-8B80-C0A9BD4E9289}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSUnitTest", "unittest\CharLSUnitTest.vcxproj", "{4A912445-1E83-41FA-8B80-C0A9BD4E9289}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CharLSNet_Standard14", "net14\CharLSNet_Standard14.csproj", "{368BA976-8A8A-425C-A082-52FAAD60DEEA}"
EndProject
Expand Down
File renamed without changes.
133 changes: 0 additions & 133 deletions CharLS_VS2015.sln

This file was deleted.

5 changes: 0 additions & 5 deletions CharLS_VS2015.sln.DotSettings

This file was deleted.

19 changes: 0 additions & 19 deletions Common_VS2015.props

This file was deleted.

6 changes: 3 additions & 3 deletions Directory.Build.props
Expand Up @@ -2,15 +2,15 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Build to a folder outside the source folders, making it easier to clean. -->
<OutDir>$(SolutionDir)bin_2017\$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin_2017\$(Configuration)\x86\</OutDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin\$(Configuration)\x86\</OutDir>

<!-- C# Projects require the legagy OutputPath variabl. -->
<OutputPath>$(OutDir)</OutputPath>

<!-- C++ temp files can be redirected. -->
<!-- C# project files can also be redirected, but this causes rebuilds inside VS2015. -->
<IntDir>$(SolutionDir)intermediate_2017\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
<IntDir>$(SolutionDir)intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>

<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<PlatformToolset>v141</PlatformToolset>
Expand Down
35 changes: 18 additions & 17 deletions README.md
@@ -1,36 +1,37 @@
[![Build status](https://ci.appveyor.com/api/projects/status/yq0naf3v2m8nfa8r/branch/master?svg=true)](https://ci.appveyor.com/project/vbaderks/charls/branch/master)
[![Build Status](https://travis-ci.org/team-charls/charls.svg?branch=master)](https://travis-ci.org/team-charls/charls)

CharLS
======
# CharLS

CharLS is a C++ implementation of the JPEG-LS standard for lossless and near-lossless image compression and decompression.
JPEG-LS is a low-complexity image compression standard that matches JPEG 2000 compression ratios.

Features
--------
* C++14 library implementation with a binary C interface for maximum interoperability. Note: C++03 compatible implementation is maintained in the 1.x-master branch.
## Features

* C++14 library implementation with a binary C interface for maximum interoperability.</br>Note: a C++03 compatible implementation is maintained in the 1.x-master branch.
* Supports Windows, Linux and Solaris in 32 bit and 64 bit.
* Includes an adapter assembly for .NET based languages.
* Excellent compression and decompression performance.

About JPEG-LS
-------------
JPEG-LS (ISO-14495-1/ITU-T.87) is an image compression standard derived from the Hewlett Packard LOCO algorithm. JPEG-LS has low complexity (meaning fast compression) and high compression ratios, similar to the JPEG 2000 lossless ratios. JPEG-LS is more similar to the old Lossless JPEG than to JPEG 2000, but interestingly the two different techniques result in vastly different performance characteristics.
## About JPEG-LS

JPEG-LS (ISO/IEC 14495-1:1999 / ITU-T.87) is an image compression standard derived from the Hewlett Packard LOCO algorithm. JPEG-LS has low complexity (meaning fast compression) and high compression ratios, similar to the JPEG 2000 lossless ratios. JPEG-LS is more similar to the old Lossless JPEG than to JPEG 2000, but interestingly the two different techniques result in vastly different performance characteristics.
Wikipedia on lossless JPEG and JPEG-LS: <http://en.wikipedia.org/wiki/Lossless_JPEG>
Tip: the ITU makes their version of the JPEG-LS standard (ITU-T.87) freely available for download, the text is identical with the ISO version.

## About this software

About this software
-------------------
This project's goal is to provide a full implementation of JPEG-LS. This library is written from scratch in portable C++. The master branch uses modern C++ v11. The 1.x branch is maintained in C++ v03. All mainstream JPEG-LS features are implemented by this library.
According to preliminary test results published on http://imagecompression.info/gralic, CharLS is about *twice as fast* as the original HP code, and beats both JPEG-XR and JPEG 2000 by a factor 3.
According to preliminary test results published on http://imagecompression.info/gralic, CharLS is about *twice as fast* as the original HP code, and beats both JPEG-XR and JPEG 2000 by a factor 3.

## Supported platforms

Supported platforms
-------------------
The code is regularly compiled/tested on Windows and 64 bit Linux. Additionally, the code has been successfully tested on Linux Intel/AMD 32/64 bit (slackware, debian, gentoo), Solaris SPARC systems, Intel based Macs and Windows CE (ARM CPU, emulated), where the less common compilers may require minor code edits. It leverages C++ language features (templates, traits) to create optimized code, which generally perform best with recent compilers. If you compile with GCC, 64 bit code performs substantially better.

Users & Acknowledgements
------------------------
## Users & Acknowledgements

CharLS is being used by [GDCM DICOM toolkit](http://sourceforge.net/projects/gdcm/), thanks for [Mathieu Malaterre](http://sourceforge.net/users/malat) for getting CharLS started on Linux. [Kato Kanryu](http://knivez.homelinux.org/) wrote an initial version of the color transfroms and the DIB output format code, for an [irfanview](http://www.irfanview.com) plugin using CharLS. Thanks to Uli Schlachter, CharLS now finally runs correctly on big-endian architectures like Sun SPARC.

Legal
-----
## Legal

The code in this project is available through a BSD style license, allowing use of the code in commercial closed source applications if you wish. **All** the code in this project is written from scratch, and not based on other JPEG-LS implementations. Be aware that Hewlett Packard claims to own patents that apply to JPEG-LS implementations, but they license it for free for conformant JPEG-LS implementations. Read more at <http://www.hpl.hp.com/loco/> before you use this if you use this code for commercial purposes.
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -9,7 +9,7 @@ platform:
- x64
before_build:
- set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin;%PATH%
- nuget restore CharLS_VS2017.sln
- nuget restore CharLS.sln
build:
project: CharLS_VS2017.sln
project: CharLS.sln
verbosity: minimal
File renamed without changes.

0 comments on commit 44004d1

Please sign in to comment.