Merge branch 'dev' into spot-removal-tool

This commit is contained in:
Hombre57
2019-12-08 00:37:54 +01:00
463 changed files with 16158 additions and 10338 deletions

View File

@@ -19,11 +19,9 @@
//
// A class representing a 16 bit rgb image with separate planes and 16 byte aligned data
//
#ifndef _IMAGEFLOAT_
#define _IMAGEFLOAT_
#pragma once
#include "imageio.h"
#include "rtengine.h"
namespace rtengine
{
@@ -31,6 +29,7 @@ using namespace procparams;
class Image8;
class Image16;
class LabImage;
/*
* Image type used by most tools; expected range: [0.0 ; 65535.0]
@@ -228,4 +227,3 @@ public:
};
}
#endif