Commit fa93f977 authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 2.8.8

parent 8537b443

Applications/Cxx/gdcmimg.cxx

+3 −2
Original line number Diff line number Diff line
@@ -858,7 +858,8 @@ int main (int argc, char *argv[]) 
      || gdcm::System::StrCaseCmp(inputextension,".rawl") == 0  // kakadu convention for raw little endian

      || gdcm::System::StrCaseCmp(inputextension,".gray") == 0  // imagemagick convention

      || gdcm::System::StrCaseCmp(inputextension,".bin") == 0   // openjp3d convention for raw little endian

      || gdcm::System::StrCaseCmp(inputextension,".rgb") == 0 ) // imagemagick convention

      || gdcm::System::StrCaseCmp(inputextension,".rgb") == 0   // imagemagick convention

      || gdcm::System::StrCaseCmp(inputextension,".yuv") == 0 ) // ffmpeg convention

      {

      if( !size[0] || !size[1] )

        {
@@ -891,7 +892,7 @@ int main (int argc, char *argv[]) 
      raw.SetPixelFormat( pf );

      if( spp )

        {

        if( pixelspp == 3 ) pi = gdcm::PhotometricInterpretation::RGB;

        if( pixelspp == 3 && !pinter ) pi = gdcm::PhotometricInterpretation::RGB;

        }

      raw.SetPhotometricInterpretation( pi );

      raw.SetNeedByteSwap( false );

Applications/Cxx/gdcminfo.cxx

+8 −4
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int checkdeflated(const char *name) 
static std::string getInfoDate(Dict *infoDict, const char *key)

{

  Object obj;

  char *s;

  const char *s;

  int year, mon, day, hour, min, sec, n;

  struct tm tmStruct;

  //char buf[256];
@@ -201,7 +201,8 @@ static std::string getInfoDate(Dict *infoDict, const char *key) 
  if (infoDict->lookup((char*)key, &obj)->isString())

#endif

    {

    s = obj.getString()->getCString();

    const GooString* gs = obj.getString();

    s = gs->getCString();

    if (s[0] == 'D' && s[1] == ':')

      {

      s += 2;
@@ -256,7 +257,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key) 
static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap)

{

  Object obj;

  GooString *s1;

  const GooString *s1;

  GBool isUnicode;

  Unicode u;

  char buf[8];
@@ -429,6 +430,7 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs 


    if( md5sum )

      {

      int ret = 0;

      char *buffer = new char[ pimage->GetBufferLength() ];

      gdcm::ImageChangePlanarConfiguration icpc;

      icpc.SetPlanarConfiguration( 0 );
@@ -449,9 +451,11 @@ static int ProcessOneFile( std::string const & filename, gdcm::Defs const & defs 
        }

      else

        {

        std::cout << "Problem decompressing file: " << filename << std::endl;

        std::cerr << "Problem decompressing file: " << filename << std::endl;

        ret = 1;

        }

      delete[] buffer;

      return ret;

      }

    }

  else if ( ms == gdcm::MediaStorage::EncapsulatedPDFStorage )

Applications/Cxx/gdcmpdf.cxx

+4 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
static std::string getInfoDate(Dict *infoDict, const char *key)

{

  Object obj;

  char *s;

  const char *s;

  int year, mon, day, hour, min, sec, n;

  struct tm tmStruct;

  //char buf[256];
@@ -49,7 +49,8 @@ static std::string getInfoDate(Dict *infoDict, const char *key) 
  if (infoDict->lookup((char*)key, &obj)->isString())

#endif

    {

    s = obj.getString()->getCString();

    const GooString* gs = obj.getString();

    s = gs->getCString();

    if (s[0] == 'D' && s[1] == ':')

      {

      s += 2;
@@ -104,7 +105,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key) 
static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode)

{

  Object obj;

  GooString *s1;

  const GooString *s1;

  GBool isUnicode = gFalse;

  Unicode u;

  char buf[8];

CMake/InstallMacros.cmake

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ macro(install_library library) 
      EXPORT ${GDCM_TARGETS_NAME}

      RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications

      LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries ${NAMELINK_SKIP}

      INCLUDES DESTINATION ${GDCM_INSTALL_INCLUDE_DIR}

      ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT DebugDevel

      )

    # need recent cmake: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbe7e8fa

CMakeLists.txt

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ endif() 
if( POLICY CMP0063 )

  cmake_policy(SET CMP0063 NEW)

endif()

if( POLICY CMP0074 )

  cmake_policy(SET CMP0074 NEW)

endif()

project(GDCM)

set(CMAKE_CXX_STANDARD 98)

set(CMAKE_CXX_EXTENSIONS OFF)
@@ -40,7 +43,7 @@ set(GDCM_PACKAGE_CONTACT "GDCM Developers <gdcm-developers@lists.sourceforge.net 
#----------------------------------------------------------------------------

set(GDCM_MAJOR_VERSION 2)

set(GDCM_MINOR_VERSION 8)

set(GDCM_BUILD_VERSION 7)

set(GDCM_BUILD_VERSION 8)

set(GDCM_VERSION

  "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")

# let advanced user the option to define GDCM_API_VERSION:
@@ -594,6 +597,11 @@ endif() 


# Need to subdirs in Source/Common before Wrapping

# to have gdcmConfigure.h around

if(GDCM_STANDALONE)

  set(BUILD_APPLICATIONS ${GDCM_BUILD_APPLICATIONS})

else()

  set(BUILD_APPLICATIONS OFF)

endif()

subdirs(Utilities)

add_subdirectory(Source)