# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1348141315 -7200
# Node ID 10bf2cd24d1d4a206836021352142c113fab91f5
# Parent  b8dfde8d64e866f770eed1730844de9493e1544a
move

diff -r b8dfde8d64e8 -r 10bf2cd24d1d Core/DicomFormat/DicomIntegerPixelAccessor.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Core/DicomFormat/DicomIntegerPixelAccessor.cpp	Thu Sep 20 13:41:55 2012 +0200
@@ -0,0 +1,193 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "DicomIntegerPixelAccessor.h"
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#include "../Core/OrthancException.h"
+#include <boost/lexical_cast.hpp>
+#include <limits>
+
+namespace Orthanc
+{
+  static const DicomTag COLUMNS(0x0028, 0x0011);
+  static const DicomTag ROWS(0x0028, 0x0010);
+  static const DicomTag SAMPLES_PER_PIXEL(0x0028, 0x0002);
+  static const DicomTag BITS_ALLOCATED(0x0028, 0x0100);
+  static const DicomTag BITS_STORED(0x0028, 0x0101);
+  static const DicomTag HIGH_BIT(0x0028, 0x0102);
+  static const DicomTag PIXEL_REPRESENTATION(0x0028, 0x0103);
+
+  DicomIntegerPixelAccessor::DicomIntegerPixelAccessor(const DicomMap& values,
+                                                       const void* pixelData,
+                                                       size_t size) :
+    pixelData_(pixelData),
+    size_(size)
+  {
+    unsigned int bitsAllocated;
+    unsigned int bitsStored;
+    unsigned int highBit;
+    unsigned int pixelRepresentation;
+
+    try
+    {
+      width_ = boost::lexical_cast<unsigned int>(values.GetValue(COLUMNS).AsString());
+      height_ = boost::lexical_cast<unsigned int>(values.GetValue(ROWS).AsString());
+      samplesPerPixel_ = boost::lexical_cast<unsigned int>(values.GetValue(SAMPLES_PER_PIXEL).AsString());
+      bitsAllocated = boost::lexical_cast<unsigned int>(values.GetValue(BITS_ALLOCATED).AsString());
+      bitsStored = boost::lexical_cast<unsigned int>(values.GetValue(BITS_STORED).AsString());
+      highBit = boost::lexical_cast<unsigned int>(values.GetValue(HIGH_BIT).AsString());
+      pixelRepresentation = boost::lexical_cast<unsigned int>(values.GetValue(PIXEL_REPRESENTATION).AsString());
+    }
+    catch (boost::bad_lexical_cast)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    frame_ = 0;
+    try
+    {
+      numberOfFrames_ = boost::lexical_cast<unsigned int>(values.GetValue(DicomTag::NUMBER_OF_FRAMES).AsString());
+    }
+    catch (OrthancException)
+    {
+      // If the tag "NumberOfFrames" is absent, assume there is a single frame
+      numberOfFrames_ = 1;
+    }
+    catch (boost::bad_lexical_cast)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    if ((bitsAllocated != 8 && bitsAllocated != 16 && 
+         bitsAllocated != 24 && bitsAllocated != 32) ||
+        numberOfFrames_ == 0)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    if (bitsAllocated > 32 ||
+        bitsStored >= 32)
+    {
+      // Not available, as the accessor internally uses int32_t values
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    if (samplesPerPixel_ != 1)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    if (width_ * height_ * bitsAllocated / 8 * numberOfFrames_ != size)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+
+    /*printf("%d %d %d %d %d %d %d %d\n", width_, height_, samplesPerPixel_, bitsAllocated,
+           bitsStored, highBit, pixelRepresentation, numberOfFrames_);*/
+
+    bytesPerPixel_ = bitsAllocated / 8;
+    shift_ = highBit + 1 - bitsStored;
+
+    if (pixelRepresentation)
+    {
+      mask_ = (1 << (bitsStored - 1)) - 1;
+      signMask_ = (1 << (bitsStored - 1));
+    }
+    else
+    {
+      mask_ = (1 << bitsStored) - 1;
+      signMask_ = 0;
+    }
+
+    rowOffset_ = width_ * bytesPerPixel_;
+    frameOffset_ = height_ * width_ * bytesPerPixel_;
+  }
+
+
+  void DicomIntegerPixelAccessor::GetExtremeValues(int32_t& min, 
+                                                   int32_t& max) const
+  {
+    if (height_ == 0 || width_ == 0)
+    {
+      min = max = 0;
+      return;
+    }
+
+    min = std::numeric_limits<int32_t>::max();
+    max = std::numeric_limits<int32_t>::min();
+    
+    for (unsigned int y = 0; y < height_; y++)
+    {
+      for (unsigned int x = 0; x < width_; x++)
+      {
+        int32_t v = GetValue(x, y);
+        if (v < min)
+          min = v;
+        if (v > max)
+          max = v;
+      }
+    }
+  }
+
+
+  int32_t DicomIntegerPixelAccessor::GetValue(unsigned int x, unsigned int y) const
+  {
+    assert(x < width_ && y < height_);
+    
+    const uint8_t* pixel = reinterpret_cast<const uint8_t*>(pixelData_) + 
+      y * rowOffset_ + x * bytesPerPixel_ + frame_ * frameOffset_;
+
+    int32_t v;
+    v = pixel[0];
+    if (bytesPerPixel_ >= 2)
+      v = v + (static_cast<int32_t>(pixel[1]) << 8);
+    if (bytesPerPixel_ >= 3)
+      v = v + (static_cast<int32_t>(pixel[2]) << 16);
+    if (bytesPerPixel_ >= 4)
+      v = v + (static_cast<int32_t>(pixel[3]) << 24);
+
+    v = (v >> shift_) & mask_;
+
+    if (v & signMask_)
+    {
+      // Signed value: Not implemented yet
+      //throw OrthancException(ErrorCode_NotImplemented);
+      v = 0;
+    }
+
+    return v;
+  }
+
+
+  void DicomIntegerPixelAccessor::SetCurrentFrame(unsigned int frame)
+  {
+    if (frame >= numberOfFrames_)
+    {
+      throw OrthancException(ErrorCode_ParameterOutOfRange);
+    }
+
+    frame_ = frame;
+  }
+
+}
diff -r b8dfde8d64e8 -r 10bf2cd24d1d Core/DicomFormat/DicomIntegerPixelAccessor.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Core/DicomFormat/DicomIntegerPixelAccessor.h	Thu Sep 20 13:41:55 2012 +0200
@@ -0,0 +1,80 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "../Core/DicomFormat/DicomMap.h"
+
+#include <stdint.h>
+
+namespace Orthanc
+{
+  class DicomIntegerPixelAccessor
+  {
+  private:
+    unsigned int width_;
+    unsigned int height_;
+    unsigned int samplesPerPixel_;
+    unsigned int numberOfFrames_;
+    const void* pixelData_;
+    size_t size_;
+
+    uint8_t shift_;
+    uint32_t signMask_;
+    uint32_t mask_;
+    size_t bytesPerPixel_;
+    unsigned int frame_;
+
+    size_t frameOffset_;
+    size_t rowOffset_;
+
+  public:
+    DicomIntegerPixelAccessor(const DicomMap& values,
+                              const void* pixelData,
+                              size_t size);
+
+    unsigned int GetWidth() const
+    {
+      return width_;
+    }
+
+    unsigned int GetHeight() const
+    {
+      return height_;
+    }
+
+    unsigned int GetNumberOfFrames() const
+    {
+      return numberOfFrames_;
+    }
+
+    unsigned int GetCurrentFrame() const
+    {
+      return frame_;
+    }
+
+    void SetCurrentFrame(unsigned int frame);
+
+    void GetExtremeValues(int32_t& min, 
+                          int32_t& max) const;
+
+    int32_t GetValue(unsigned int x, unsigned int y) const;
+  };
+}
diff -r b8dfde8d64e8 -r 10bf2cd24d1d OrthancServer/DicomIntegerPixelAccessor.cpp
--- a/OrthancServer/DicomIntegerPixelAccessor.cpp	Thu Sep 20 13:41:18 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
- * Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#include "DicomIntegerPixelAccessor.h"
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#include "../Core/OrthancException.h"
-#include <boost/lexical_cast.hpp>
-#include <limits>
-
-namespace Orthanc
-{
-  static const DicomTag COLUMNS(0x0028, 0x0011);
-  static const DicomTag ROWS(0x0028, 0x0010);
-  static const DicomTag SAMPLES_PER_PIXEL(0x0028, 0x0002);
-  static const DicomTag BITS_ALLOCATED(0x0028, 0x0100);
-  static const DicomTag BITS_STORED(0x0028, 0x0101);
-  static const DicomTag HIGH_BIT(0x0028, 0x0102);
-  static const DicomTag PIXEL_REPRESENTATION(0x0028, 0x0103);
-
-  DicomIntegerPixelAccessor::DicomIntegerPixelAccessor(const DicomMap& values,
-                                                       const void* pixelData,
-                                                       size_t size) :
-    pixelData_(pixelData),
-    size_(size)
-  {
-    unsigned int bitsAllocated;
-    unsigned int bitsStored;
-    unsigned int highBit;
-    unsigned int pixelRepresentation;
-
-    try
-    {
-      width_ = boost::lexical_cast<unsigned int>(values.GetValue(COLUMNS).AsString());
-      height_ = boost::lexical_cast<unsigned int>(values.GetValue(ROWS).AsString());
-      samplesPerPixel_ = boost::lexical_cast<unsigned int>(values.GetValue(SAMPLES_PER_PIXEL).AsString());
-      bitsAllocated = boost::lexical_cast<unsigned int>(values.GetValue(BITS_ALLOCATED).AsString());
-      bitsStored = boost::lexical_cast<unsigned int>(values.GetValue(BITS_STORED).AsString());
-      highBit = boost::lexical_cast<unsigned int>(values.GetValue(HIGH_BIT).AsString());
-      pixelRepresentation = boost::lexical_cast<unsigned int>(values.GetValue(PIXEL_REPRESENTATION).AsString());
-    }
-    catch (boost::bad_lexical_cast)
-    {
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    frame_ = 0;
-    try
-    {
-      numberOfFrames_ = boost::lexical_cast<unsigned int>(values.GetValue(DicomTag::NUMBER_OF_FRAMES).AsString());
-    }
-    catch (OrthancException)
-    {
-      // If the tag "NumberOfFrames" is absent, assume there is a single frame
-      numberOfFrames_ = 1;
-    }
-    catch (boost::bad_lexical_cast)
-    {
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    if ((bitsAllocated != 8 && bitsAllocated != 16 && 
-         bitsAllocated != 24 && bitsAllocated != 32) ||
-        numberOfFrames_ == 0)
-    {
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    if (bitsAllocated > 32 ||
-        bitsStored >= 32)
-    {
-      // Not available, as the accessor internally uses int32_t values
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    if (samplesPerPixel_ != 1)
-    {
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    if (width_ * height_ * bitsAllocated / 8 * numberOfFrames_ != size)
-    {
-      throw OrthancException(ErrorCode_NotImplemented);
-    }
-
-    /*printf("%d %d %d %d %d %d %d %d\n", width_, height_, samplesPerPixel_, bitsAllocated,
-           bitsStored, highBit, pixelRepresentation, numberOfFrames_);*/
-
-    bytesPerPixel_ = bitsAllocated / 8;
-    shift_ = highBit + 1 - bitsStored;
-
-    if (pixelRepresentation)
-    {
-      mask_ = (1 << (bitsStored - 1)) - 1;
-      signMask_ = (1 << (bitsStored - 1));
-    }
-    else
-    {
-      mask_ = (1 << bitsStored) - 1;
-      signMask_ = 0;
-    }
-
-    rowOffset_ = width_ * bytesPerPixel_;
-    frameOffset_ = height_ * width_ * bytesPerPixel_;
-  }
-
-
-  void DicomIntegerPixelAccessor::GetExtremeValues(int32_t& min, 
-                                                   int32_t& max) const
-  {
-    if (height_ == 0 || width_ == 0)
-    {
-      min = max = 0;
-      return;
-    }
-
-    min = std::numeric_limits<int32_t>::max();
-    max = std::numeric_limits<int32_t>::min();
-    
-    for (unsigned int y = 0; y < height_; y++)
-    {
-      for (unsigned int x = 0; x < width_; x++)
-      {
-        int32_t v = GetValue(x, y);
-        if (v < min)
-          min = v;
-        if (v > max)
-          max = v;
-      }
-    }
-  }
-
-
-  int32_t DicomIntegerPixelAccessor::GetValue(unsigned int x, unsigned int y) const
-  {
-    assert(x < width_ && y < height_);
-    
-    const uint8_t* pixel = reinterpret_cast<const uint8_t*>(pixelData_) + 
-      y * rowOffset_ + x * bytesPerPixel_ + frame_ * frameOffset_;
-
-    int32_t v;
-    v = pixel[0];
-    if (bytesPerPixel_ >= 2)
-      v = v + (static_cast<int32_t>(pixel[1]) << 8);
-    if (bytesPerPixel_ >= 3)
-      v = v + (static_cast<int32_t>(pixel[2]) << 16);
-    if (bytesPerPixel_ >= 4)
-      v = v + (static_cast<int32_t>(pixel[3]) << 24);
-
-    v = (v >> shift_) & mask_;
-
-    if (v & signMask_)
-    {
-      // Signed value: Not implemented yet
-      //throw OrthancException(ErrorCode_NotImplemented);
-      v = 0;
-    }
-
-    return v;
-  }
-
-
-  void DicomIntegerPixelAccessor::SetCurrentFrame(unsigned int frame)
-  {
-    if (frame >= numberOfFrames_)
-    {
-      throw OrthancException(ErrorCode_ParameterOutOfRange);
-    }
-
-    frame_ = frame;
-  }
-
-}
diff -r b8dfde8d64e8 -r 10bf2cd24d1d OrthancServer/DicomIntegerPixelAccessor.h
--- a/OrthancServer/DicomIntegerPixelAccessor.h	Thu Sep 20 13:41:18 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
- * Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#pragma once
-
-#include "../Core/DicomFormat/DicomMap.h"
-
-#include <stdint.h>
-
-namespace Orthanc
-{
-  class DicomIntegerPixelAccessor
-  {
-  private:
-    unsigned int width_;
-    unsigned int height_;
-    unsigned int samplesPerPixel_;
-    unsigned int numberOfFrames_;
-    const void* pixelData_;
-    size_t size_;
-
-    uint8_t shift_;
-    uint32_t signMask_;
-    uint32_t mask_;
-    size_t bytesPerPixel_;
-    unsigned int frame_;
-
-    size_t frameOffset_;
-    size_t rowOffset_;
-
-  public:
-    DicomIntegerPixelAccessor(const DicomMap& values,
-                              const void* pixelData,
-                              size_t size);
-
-    unsigned int GetWidth() const
-    {
-      return width_;
-    }
-
-    unsigned int GetHeight() const
-    {
-      return height_;
-    }
-
-    unsigned int GetNumberOfFrames() const
-    {
-      return numberOfFrames_;
-    }
-
-    unsigned int GetCurrentFrame() const
-    {
-      return frame_;
-    }
-
-    void SetCurrentFrame(unsigned int frame);
-
-    void GetExtremeValues(int32_t& min, 
-                          int32_t& max) const;
-
-    int32_t GetValue(unsigned int x, unsigned int y) const;
-  };
-}