diff options
| -rw-r--r-- | src/Hill.cxx | 2 | ||||
| -rw-r--r-- | src/ImageMetaData.cxx | 9 | ||||
| -rw-r--r-- | src/OutputImage.cxx | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Hill.cxx b/src/Hill.cxx index b059897..2aad3f3 100644 --- a/src/Hill.cxx +++ b/src/Hill.cxx @@ -142,7 +142,7 @@ void Hills::mark_duplicates(double dist) { j = i + 1; n = get(j); while (n && fabs(n->phi - m->phi) <= dist) { - if (! n->flags & Hill::DUPLIC) { + if (! (n->flags & Hill::DUPLIC)) { if (fabs(n->lam - m->lam) <= dist && fabs(n->height - m->height) <= 50.0 ) { n->flags |= Hill::DUPLIC; diff --git a/src/ImageMetaData.cxx b/src/ImageMetaData.cxx index b54da74..32ba477 100644 --- a/src/ImageMetaData.cxx +++ b/src/ImageMetaData.cxx @@ -17,8 +17,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exiv2.hpp> #include "../config.h" #include "ImageMetaData.H" @@ -107,7 +106,7 @@ ImageMetaData::load_image_exif(char *name) { try { image = Exiv2::ImageFactory::open(name); image->readMetadata(); - } catch (Exiv2::Error error) { + } catch (const Exiv2::Error &error) { fprintf(stderr, "Error reading metadata\n"); return 1; } @@ -175,7 +174,7 @@ ImageMetaData::load_image_jpgcom(char *name) { try { image = Exiv2::ImageFactory::open(name); image->readMetadata(); - } catch (Exiv2::Error error) { + } catch (const Exiv2::Error &error) { fprintf(stderr, "Error reading metadata\n"); return 1; } @@ -267,7 +266,7 @@ ImageMetaData::save_image_jpgcom(char *in_img, char *out_img) { try { image->writeMetadata(); - } catch (Exiv2::Error error) { + } catch (const Exiv2::Error &error) { fprintf(stderr, "Error writing metadata\n"); err++; } diff --git a/src/OutputImage.cxx b/src/OutputImage.cxx index c5848b4..b4c4739 100644 --- a/src/OutputImage.cxx +++ b/src/OutputImage.cxx @@ -49,9 +49,10 @@ OutputImage::next_line() { int OutputImage::done() { - if (!initialized) + if (!initialized) { return 1; - else + } else { next_line(); return done_internal(); + } } |