# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1402414334 -7200
# Node ID 27b2d377c70e31f4879b1c2aa04f1e178ae1200e
# Parent  54d2c5df676051e5897c04e4df5c57c7b0914417# Parent  ea246626b96c4c5d04ebe903a560a5fc5f78d874
integration jpeg -> mainline

diff -r 54d2c5df6760 -r 27b2d377c70e OrthancServer/Internals/DicomImageDecoder.h
--- a/OrthancServer/Internals/DicomImageDecoder.h	Tue Jun 10 17:28:04 2014 +0200
+++ b/OrthancServer/Internals/DicomImageDecoder.h	Tue Jun 10 17:32:14 2014 +0200
@@ -52,11 +52,9 @@
     static void SetupImageBuffer(ImageBuffer& target,
                                  DcmDataset& dataset);
 
-  public:   // TODO SWITCH TO PRIVATE
     static bool DecodePsmctRle1(std::string& output,
                                 DcmDataset& dataset);
 
-  public:
     static bool IsUncompressedImage(const DcmDataset& dataset);
 
     static bool IsJpegLossless(const DcmDataset& dataset);
@@ -71,6 +69,7 @@
                                    unsigned int frame);
 #endif
 
+  public:
     static bool Decode(ImageBuffer& target,
                        DcmDataset& dataset,
                        unsigned int frame);
diff -r 54d2c5df6760 -r 27b2d377c70e UnitTestsSources/JpegLossless.cpp
--- a/UnitTestsSources/JpegLossless.cpp	Tue Jun 10 17:28:04 2014 +0200
+++ b/UnitTestsSources/JpegLossless.cpp	Tue Jun 10 17:32:14 2014 +0200
@@ -47,66 +47,8 @@
 using namespace Orthanc;
 
 
-TEST(JpegLossless, Basic)
-{
-#if 0
-  // Fallback
 
-  std::string s;
-  Toolbox::ReadFile(s, "IM-0001-1001-0001.dcm");
-
-  ParsedDicomFile parsed(s);
-  DcmFileFormat& dicom = *reinterpret_cast<DcmFileFormat*>(parsed.GetDcmtkObject());
-
-  DcmDataset* dataset = dicom.getDataset();
-
-  dataset->chooseRepresentation(EXS_LittleEndianExplicit, NULL);
-
-  if (dataset->canWriteXfer(EXS_LittleEndianExplicit))
-  {
-    printf("ICI\n");
-
-    parsed.SaveToFile("tutu.dcm");
-
-    // decompress data set if compressed
-    dataset->chooseRepresentation(EXS_LittleEndianExplicit, NULL);
-
-    DcmXfer original_xfer(dataset->getOriginalXfer());
-    std::cout << original_xfer.getXferName() << std::endl;
-
-    FromDcmtkBridge::ExtractPngImage(s, *dataset, 1, ImageExtractionMode_Preview);
-    //fileformat.saveFile("test_decompressed.dcm", EXS_LittleEndianExplicit);
-  }
-#else
-  DcmFileFormat fileformat;
-  //ASSERT_TRUE(fileformat.loadFile("IM-0001-1001-0001.dcm").good());
-  //ASSERT_TRUE(fileformat.loadFile("tata.dcm").good());
-  ASSERT_TRUE(fileformat.loadFile("RG2_JPLY").good());
-  
-  DcmDataset& dataset = *fileformat.getDataset();
-
-  //ASSERT_TRUE(DicomImageDecoder::IsJpegLossless(dataset));
-
-  ImageBuffer image;
-  //DicomImageDecoder::DecodeJpegLossless(image, dataset, 0);
-  DicomImageDecoder::Decode(image, dataset, 0);
-
-  ImageAccessor accessor(image.GetAccessor());
-
-  for (unsigned int y = 0; y < accessor.GetHeight(); y++)
-  {
-    int16_t *p = reinterpret_cast<int16_t*>(accessor.GetRow(y));
-    for (unsigned int x = 0; x < accessor.GetWidth(); x++, p ++)
-    {
-      if (*p < 0)
-        *p = 0;
-    }
-  }
-
-  PngWriter w;
-  w.WriteToFile("tata.png", accessor);
-#endif
-}
+// TODO Write a test
 
 
 #endif