From b59af433e40b788e90b68219cf1d2ef6bf4098a4 Mon Sep 17 00:00:00 2001
From: koennecke <koennecke>
Date: Wed, 5 Sep 2007 11:16:22 +0000
Subject: [PATCH] - Fixed amorstatus collapse for large image sizes

---
 amorstat.c | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/amorstat.c b/amorstat.c
index 54037a7..a97c524 100644
--- a/amorstat.c
+++ b/amorstat.c
@@ -591,23 +591,31 @@
      } 
      else if(self->iHTTP == 1)
      {
-       
-       snprintf(hmCommand,255,"sum:2:0:%d",iDim[2]);
-       if(self->pHM->pDriv->SubSample != NULL){
-           data = self->pHM->pDriv->SubSample(self->pHM->pDriv,pCon,0,hmCommand);
+       if(i3 > 2){
+           snprintf(hmCommand,255,"sum:2:0:%d",iDim[2]);
+           if(self->pHM->pDriv->SubSample != NULL){
+               data = self->pHM->pDriv->SubSample(self->pHM->pDriv,pCon,0,hmCommand);
+            } else {
+                data = NULL;
+            }
+         if(data == NULL)
+         {
+            SCWrite(pCon,"ERROR: failed to retrieve collapsed data from HM", eError);
+            return 0;
+         }
+         for(i = 2; i < length; i++)
+         {
+            iImage[i] = htonl(data[i-1]);
+         }
+         free(data);
        } else {
-            data = NULL;
+            GetHistogramDirect(self->pHM,pCon,0,0,length-2, 
+                &iImage[2], length*sizeof(HistInt));
+            for(i = 2; i < length; i++)
+            {
+                iImage[i] = htonl(iImage[i]);
+            }
        }
-       if(data == NULL)
-       {
-	 SCWrite(pCon,"ERROR: failed to retrieve collapsed data from HM", eError);
-         return 0;
-       }
-       for(i = 2; i < length; i++)
-       {
-	 iImage[i] = htonl(data[i-1]);
-       }
-       free(data);
      }
      else
      {