Skip to content

Commit 26e5d4c

Browse files
authored
POL5822 fix to image moment calculation on a constant-intensity montage image (PolusAI#295)
1 parent 9c40923 commit 26e5d4c

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

src/nyx/features/2d_geomoments_basic.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,6 @@ void BasicGeomoms2D::calculate(LR& r, intenfunction ifun)
9999
{
100100
INTEN = ifun;
101101

102-
// intercept blank ROIs
103-
if (r.aux_max == r.aux_min)
104-
{
105-
// spatial moments
106-
m00 = m01 = m02 = m03 = m10 = m11 = m12 = m13 = m20 = m21 = m22 = m23 = m30 =
107-
// weighted spatial moments
108-
wm00 = wm01 = wm02 = wm03 = wm10 = wm11 = wm12 = wm20 = wm21 = wm30 =
109-
// normalized spatial moments
110-
w00 = w01 = w02 = w03 = w10 = w11 = w12 = w13 = w20 = w21 = w22 = w23 = w30 = w31 = w32 = w33 =
111-
// normalized central moments
112-
nu02 = nu03 = nu11 = nu12 = nu20 = nu21 = nu30 =
113-
// central moments
114-
mu00 = mu01 = mu02 = mu03 = mu10 = mu11 = mu12 = mu13 = mu20 = mu21 = mu22 = mu23 = mu30 = mu31 = mu32 = mu33 =
115-
// weighted central moments
116-
wmu02 = wmu03 = wmu11 = wmu12 = wmu20 = wmu21 = wmu30 =
117-
// Hu invariants
118-
hm1 = hm2 = hm3 = hm4 = hm5 = hm6 = hm7 =
119-
// weighted Hu invariants
120-
whm1 = whm2 = whm3 = whm4 = whm5 = whm6 = whm7 = theEnvironment.resultOptions.noval();
121-
122-
return;
123-
}
124-
125102
// Cache ROI frame of reference
126103
baseX = r.aabb.get_xmin();
127104
baseY = r.aabb.get_ymin();

src/nyx/nyxus_dicom_loader.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "dcmtk/dcmjpeg/djdecode.h" /* for JPEG decoders */
66
#include "dcmtk/dcmjpls/djdecode.h" /* for JPEG-LS decoders */
77
#include "dcmtk/dcmdata/dcrledrg.h" /* for RLE decoder */
8+
#include "dcmtk/dcmdata/dcpixel.h" /* for RLE decoder */
89
#include "dcmtk/dcmjpeg/dipijpeg.h" /* for dcmimage JPEG plugin */
910
#include "dcmtk/dcmseg/segdoc.h"
1011
#include "dcmtk/dcmseg/segment.h"

0 commit comments

Comments
 (0)