- Fixed amorstatus collapse for large image sizes
This commit is contained in:
38
amorstat.c
38
amorstat.c
@ -591,23 +591,31 @@
|
|||||||
}
|
}
|
||||||
else if(self->iHTTP == 1)
|
else if(self->iHTTP == 1)
|
||||||
{
|
{
|
||||||
|
if(i3 > 2){
|
||||||
snprintf(hmCommand,255,"sum:2:0:%d",iDim[2]);
|
snprintf(hmCommand,255,"sum:2:0:%d",iDim[2]);
|
||||||
if(self->pHM->pDriv->SubSample != NULL){
|
if(self->pHM->pDriv->SubSample != NULL){
|
||||||
data = self->pHM->pDriv->SubSample(self->pHM->pDriv,pCon,0,hmCommand);
|
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 {
|
} 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
|
else
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user