Commit 08d50475 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2.0.0+dfsg

parent f8227066

.gitignore

+9 −3
Original line number Diff line number Diff line
@@ -4,17 +4,20 @@ obj/ 
bin/

Win32/

x64/

.vscode/

[Dd]ebug/

[Rr]elease/

[Cc]hecked/

*.opensdf

*.sdf



# Ignore files created by Visual Studio

*.suo

*.user

*.ipch

*.opensdf

*.sdf

*.opendb

*.db

*.aps



# NuGet Packages

*.nupkg
@@ -22,3 +25,6 @@ x64/ 
**/packages/*

# except build/, which is used as an MSBuild target.

!**/packages/build/



# Ignore Coverity build folder

cov-int/

.travis.yml

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ compiler: 
  - clang



install:

- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi

- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi

- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi



addons:
@@ -14,8 +14,8 @@ addons: 
    - ubuntu-toolchain-r-test

    - llvm-toolchain-precise-3.7

    packages:

    - gcc-4.8

    - g++-4.8

    - gcc-5

    - g++-5

    - clang-3.7



sudo: false

CMakeLists.txt

+58 −61
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ if (CMAKE_COMPILER_IS_GNUCC) 
    # SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3 -Wall -Wextra -pedantic -fvisibility=hidden -fomit-frame-pointer -momit-leaf-frame-pointer -fweb  -ftracer" )



    # Define GNU C++ defines for both Debug and Release

    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03 -Wall -Wextra")

    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra")



    # Define specific Debug settings.

    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
@@ -18,7 +18,7 @@ ENDIF () 


if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

    # Define clang C++ defines for both Debug and Release

    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03 -Wall -Wextra")

    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra")



    # Define specific Debug settings.

    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
@@ -38,13 +38,10 @@ if (WIN32) 
   endif()

endif()



set (charls_HEADERS

src/context.h         src/defaulttraits.h    src/jpegimagedatasegment.h  src/jpegsegment.h           src/lookuptable.h       src/publictypes.h

src/colortransform.h  src/contextrunmode.h   src/encoderstrategy.h       src/jpegmarker.h            src/losslesstraits.h    src/scan.h

src/config.h          src/decoderstrategy.h  src/header.h                src/jpegmarkersegment.h     src/jpegstreamwriter.h  src/processline.h     src/util.h)

set (charls_PUBLIC_HEADERS src/charls.h src/publictypes.h)



add_library(CharLS src/interface.cpp src/jpegls.cpp src/jpegmarkersegment.cpp src/header.cpp src/jpegstreamwriter.cpp)

set (CHARLS_LIB_MAJOR_VERSION 1)

add_library(CharLS src/interface.cpp src/jpegls.cpp src/jpegmarkersegment.cpp src/jpegstreamreader.cpp src/jpegstreamwriter.cpp)

set (CHARLS_LIB_MAJOR_VERSION 2)

set (CHARLS_LIB_MINOR_VERSION 0)

set_target_properties(CharLS PROPERTIES

                             VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION}
@@ -53,7 +50,7 @@ set_target_properties( CharLS PROPERTIES 
install (TARGETS CharLS RUNTIME DESTINATION bin

                        LIBRARY DESTINATION lib${LIB_SUFFIX}

                        ARCHIVE DESTINATION lib${LIB_SUFFIX})

install (FILES ${charls_HEADERS} DESTINATION include/CharLS)

install (FILES ${charls_PUBLIC_HEADERS} DESTINATION include/CharLS)



if (BUILD_TESTING)

  add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)

CharLS_VS2015.sln

+128 −54
Original line number Diff line number Diff line 


Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio 14

VisualStudioVersion = 14.0.24720.0

VisualStudioVersion = 14.0.23107.0

MinimumVisualStudioVersion = 10.0.40219.1

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{1C1CF63C-A53A-449F-90D3-63321015FD65}"

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNet_VS2015", "net\CharLSNet_VS2015.csproj", "{4EDED401-1B63-4989-BF3F-2875B6C9203D}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLS_VS2015", "src\CharLS_VS2015.vcxproj", "{FF506D97-CF63-4268-97B8-6195E13A0114}"

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNetTest_VS2015", "nettest\CharLSNetTest_VS2015.csproj", "{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSTest_VS2015", "test\CharLSTest_VS2015.vcxproj", "{3E349E7B-30C2-4791-81B7-1108014291B7}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Viewer_VS2015", "samples\viewer\Viewer_VS2015.csproj", "{62B47821-5105-49A2-A157-5FAE1AEA0686}"

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}") = "CharLSUnitTest_VS2015", "unittest\CharLSUnitTest_VS2015.vcxproj", "{5293D7B4-4192-41FD-B9AF-CF4051D44545}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLS_VS2015", "src\CharLS_VS2015.vcxproj", "{524BE26D-FC60-4BC4-9100-128A0502FFF7}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert_VS2015", "samples\convert.c\Convert_VS2015.vcxproj", "{C36798B3-86DA-4935-80C4-996D5C415DA1}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Checked|Win32 = Checked|Win32
@@ -19,18 +33,30 @@ Global 
		Release|x64 = Release|x64

	EndGlobalSection

	GlobalSection(ProjectConfigurationPlatforms) = postSolution

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Checked|Win32.ActiveCfg = Checked|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Checked|Win32.Build.0 = Checked|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Checked|x64.ActiveCfg = Checked|x64

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Checked|x64.Build.0 = Checked|x64

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Debug|Win32.ActiveCfg = Debug|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Debug|Win32.Build.0 = Debug|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Debug|x64.ActiveCfg = Debug|x64

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Debug|x64.Build.0 = Debug|x64

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Release|Win32.ActiveCfg = Release|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Release|Win32.Build.0 = Release|Win32

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Release|x64.ActiveCfg = Release|x64

		{FF506D97-CF63-4268-97B8-6195E13A0114}.Release|x64.Build.0 = Release|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Checked|Win32.ActiveCfg = Checked|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Checked|Win32.Build.0 = Checked|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Checked|x64.ActiveCfg = Checked|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Checked|x64.Build.0 = Checked|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Debug|Win32.ActiveCfg = Debug|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Debug|Win32.Build.0 = Debug|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Debug|x64.ActiveCfg = Debug|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Debug|x64.Build.0 = Debug|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Release|Win32.ActiveCfg = Release|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Release|Win32.Build.0 = Release|x86

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Release|x64.ActiveCfg = Release|x64

		{4EDED401-1B63-4989-BF3F-2875B6C9203D}.Release|x64.Build.0 = Release|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Checked|Win32.ActiveCfg = Checked|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Checked|Win32.Build.0 = Checked|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Checked|x64.ActiveCfg = Checked|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Checked|x64.Build.0 = Checked|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Debug|Win32.ActiveCfg = Debug|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Debug|Win32.Build.0 = Debug|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Debug|x64.ActiveCfg = Debug|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Debug|x64.Build.0 = Debug|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Release|Win32.ActiveCfg = Release|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Release|Win32.Build.0 = Release|x86

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Release|x64.ActiveCfg = Release|x64

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41}.Release|x64.Build.0 = Release|x64

		{3E349E7B-30C2-4791-81B7-1108014291B7}.Checked|Win32.ActiveCfg = Checked|Win32

		{3E349E7B-30C2-4791-81B7-1108014291B7}.Checked|Win32.Build.0 = Checked|Win32

		{3E349E7B-30C2-4791-81B7-1108014291B7}.Checked|x64.ActiveCfg = Checked|x64
@@ -43,12 +69,60 @@ Global 
		{3E349E7B-30C2-4791-81B7-1108014291B7}.Release|Win32.Build.0 = Release|Win32

		{3E349E7B-30C2-4791-81B7-1108014291B7}.Release|x64.ActiveCfg = Release|x64

		{3E349E7B-30C2-4791-81B7-1108014291B7}.Release|x64.Build.0 = Release|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Checked|Win32.ActiveCfg = Checked|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Checked|Win32.Build.0 = Checked|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Checked|x64.ActiveCfg = Checked|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Checked|x64.Build.0 = Checked|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Debug|Win32.ActiveCfg = Debug|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Debug|Win32.Build.0 = Debug|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Debug|x64.ActiveCfg = Debug|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Debug|x64.Build.0 = Debug|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Release|Win32.ActiveCfg = Release|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Release|Win32.Build.0 = Release|x86

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Release|x64.ActiveCfg = Release|x64

		{62B47821-5105-49A2-A157-5FAE1AEA0686}.Release|x64.Build.0 = Release|x64

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Checked|Win32.ActiveCfg = Debug|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Checked|x64.ActiveCfg = Checked|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Debug|Win32.ActiveCfg = Debug|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Debug|Win32.Build.0 = Debug|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Debug|x64.ActiveCfg = Debug|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Release|Win32.ActiveCfg = Release|Win32

		{5293D7B4-4192-41FD-B9AF-CF4051D44545}.Release|x64.ActiveCfg = Release|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Checked|Win32.ActiveCfg = Checked|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Checked|Win32.Build.0 = Checked|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Checked|x64.ActiveCfg = Checked|x64

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Checked|x64.Build.0 = Checked|x64

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Debug|Win32.ActiveCfg = Debug|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Debug|Win32.Build.0 = Debug|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Debug|x64.ActiveCfg = Debug|x64

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Debug|x64.Build.0 = Debug|x64

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Release|Win32.ActiveCfg = Release|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Release|Win32.Build.0 = Release|Win32

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Release|x64.ActiveCfg = Release|x64

		{524BE26D-FC60-4BC4-9100-128A0502FFF7}.Release|x64.Build.0 = Release|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Checked|Win32.ActiveCfg = Release|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Checked|Win32.Build.0 = Release|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Checked|x64.ActiveCfg = Checked|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Checked|x64.Build.0 = Checked|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Debug|Win32.ActiveCfg = Debug|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Debug|Win32.Build.0 = Debug|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Debug|x64.ActiveCfg = Debug|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Debug|x64.Build.0 = Debug|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Release|Win32.ActiveCfg = Release|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Release|Win32.Build.0 = Release|Win32

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Release|x64.ActiveCfg = Release|x64

		{C36798B3-86DA-4935-80C4-996D5C415DA1}.Release|x64.Build.0 = Release|x64

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

	EndGlobalSection

	GlobalSection(NestedProjects) = preSolution

		{FF506D97-CF63-4268-97B8-6195E13A0114} = {1C1CF63C-A53A-449F-90D3-63321015FD65}

		{4EDED401-1B63-4989-BF3F-2875B6C9203D} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}

		{8B9087C8-9C4D-4F4E-BAC3-2434D915DD41} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}

		{3E349E7B-30C2-4791-81B7-1108014291B7} = {1C1CF63C-A53A-449F-90D3-63321015FD65}

		{62B47821-5105-49A2-A157-5FAE1AEA0686} = {BE733144-010D-4F7F-A619-0B73D8461D60}

		{5293D7B4-4192-41FD-B9AF-CF4051D44545} = {1C1CF63C-A53A-449F-90D3-63321015FD65}

		{524BE26D-FC60-4BC4-9100-128A0502FFF7} = {1C1CF63C-A53A-449F-90D3-63321015FD65}

		{C36798B3-86DA-4935-80C4-996D5C415DA1} = {BE733144-010D-4F7F-A619-0B73D8461D60}

	EndGlobalSection

EndGlobal

CharLS_VS2015.sln.DotSettings

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">

	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LS/@EntryIndexedValue">LS</s:String>

	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>

	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>

	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
 
 No newline at end of file