Pull request #150: cleaned up image code

Merge in RED/redaction-service from image-cleanup to master

* commit '1ddcafbdd23adb8354259660e25723449fb47855':
  cleaned up image code

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationService.java

@@ -156,7 +156,7 @@ public class PdfSegmentationService {
             boolean beginImage = true;
 
             // a List of Boolean, true = candidate for merging, false = no merging
-            ArrayList<Boolean> candidatesList = getCandidatesList(imageList);
+            List<Boolean> candidatesList = getCandidatesList(imageList);
 
             // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
             for (int i = 0; i < candidatesList.size(); i++) {
@@ -164,13 +164,19 @@ public class PdfSegmentationService {
                     if (beginImage) {
                         //begin of image, merge two parts of imageList
                         PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1));
+                        // image merge successful
+                        if (mergedImage != null) {
                             mergedList.add(mergedImage);
                             countElementsInList++;
+                        }
                     } else {
                         //middle of an image, merge current piece auf mergedList with image of imageList
                         PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1));
+                        // image merge successful
+                        if (mergedImage != null) {
                             mergedList.set(countElementsInList - 1, mergedImage);
                         }
+                    }
                     beginImage = false;
                 } else {
                     // if the last candidate is false, then both images i and i+1 must be added
@@ -194,14 +200,15 @@ public class PdfSegmentationService {
                         }
                     }
                 }
-            }return mergedList;
+            }
+            return mergedList;
         } else {
             return imageList;
         }
     }
 
     private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2) {
-        PdfImage newPdfImage = null;
+
         // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
         double width = image1.getPosition().getWidth();
         double height1 = image1.getPosition().getHeight();
@@ -212,34 +219,43 @@ public class PdfSegmentationService {
         double img2height = image2.getImage().getHeight();
 
         BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
-        Graphics g = mergedImage.getGraphics();
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
         try {
-            g.drawImage(image1.getImage(),0,0,null);
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
-            g.drawImage(image2.getImage(),0, (int) (img1height),null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
 
             // set Image, Position and type for merged Image
             //set position for merged image with values of image1 and the height of both
             Rectangle2D pos = new Rectangle2D.Float();
             pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), width, height1 + height2);
-            newPdfImage = new PdfImage(mergedImage,pos,0);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
             // Graphics need to be disposed
-            newPdfImage.getImage().flush();
+
-            newPdfImage.getImage().getGraphics().dispose();
+            image1.getImage().flush();
-        } catch (Exception e) {
+            image2.getImage().flush();
-            e.printStackTrace();
+
-        }
+            mergedImage.flush();
-        newPdfImage.setPage(image1.getPage());
+            mergedImageGraphics.dispose();
+
             return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
     }
 
     //make a list of true and false, if the image is a candidate for merging
-    private ArrayList<Boolean> getCandidatesList(List<PdfImage> imageList) {
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList) {
-        ArrayList<Boolean> candidatesList = new ArrayList<>();
+        List<Boolean> candidatesList = new ArrayList<>();
         for (int i = 0; i < imageList.size(); i++) {
             if (i >= 1) {
                 candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i)));
             }
-        }return candidatesList;
+        }
+        return candidatesList;
     }
 
     // evaluate if two images are candidates for merging, depending on their coordinates, width and height