mark/small-image-descriptors
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes implemented and experiments added

Browse Source 
Wwo!
This commit is contained in:
Mark Hoekveen
2018-10-12 20:22:04 +02:00
parent edfa53a4ff
commit c3d4c7ea11
4 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Descriptor.h
+40 -26
View File
@@ -76,6 +76,7 @@ public:
c[0] = converted[i] * 255.0;
c++;
}
delete newimg;
//newimg->write("Out.png"); //for debugging purposes
return converted;
}
@@ -151,19 +152,20 @@ public:
class median : public Descriptor {
public:
bitset<64> feature(Image* img) {
img->type(GrayscaleType);
img->filterType(LanczosFilter); //fast resizing, should have minimal impact on accuracy
img->resize(Geometry(8, 8, 0, 0)); //64 pixels
Image* local_image = new Image(*img);
local_image->type(GrayscaleType);
local_image->filterType(LanczosFilter); //fast resizing, should have minimal impact on accuracy
local_image->resize(Geometry(8, 8, 0, 0)); //64 pixels
ssize_t n = 8;
ssize_t m = 8;
Pixels view(*img);
Pixels view(*local_image);
float intensity = 0;
int numpixels = (int)(n*m);
const Quantum *p = view.getConst(0, 0, n, m); //entire image
int* intensities = new int[numpixels];
int index = 0;
int chan = (int)img->channels(); //should be 1, for a grayscale img
int chan = (int)local_image->channels(); //should be 1, for a grayscale img
for (ssize_t j = 0; j < m; j++) {
for (ssize_t i = 0; i < n; i++) {
//LTR scanning
@@ -183,9 +185,11 @@ public:
retval <<= 1;
if (q[0] > intensity)
retval |= bitset<64>(1);
q = q + img->channels();
q = q + local_image->channels();
}
}
delete local_image;
delete intensities;
return retval;
}
@@ -208,21 +212,22 @@ public:
class sobel : public Descriptor {
public:
bitset<64> feature(Image* img) {
Image* local_image = new Image(*img);
//TODO: Some preprocessing for this?
//img->reduceNoise(4.0);
img->type(GrayscaleType);
local_image->type(GrayscaleType);
//Apply sobel convolution
img->convolve(3, sobelX);
img->convolve(3, sobelY);
local_image->convolve(3, sobelX);
local_image->convolve(3, sobelY);
ssize_t n = img->rows();
ssize_t m = img->columns();
ssize_t n = local_image->rows();
ssize_t m = local_image->columns();
Pixels view(*img);
Pixels view(*local_image);
const Quantum *p = view.getConst(0, 0, m, n); //entire image
unsigned long long intensity = 0;
int chan = (int)img->channels();
int chan = (int)local_image->channels();
for (ssize_t j = 0; j < m; j++) {
for (ssize_t i = 0; i < n; i++) {
//LTR scanning
@@ -233,6 +238,7 @@ public:
//cout << endl;
}
int scaledIntensity = ((float)(intensity / (n*m)) / QuantumRange) * 255;
delete local_image;
return bitset<64>(scaledIntensity);
}
string ToString() {
@@ -250,15 +256,16 @@ private:
class pearson : public Descriptor {
public:
bitset<64> feature(Image* img) {
img->type(GrayscaleType);
img->filterType(LanczosFilter); //fast!
img->resize(Geometry(8, 8)); //64 pixels
Image* local_image = new Image(*img);
local_image->type(GrayscaleType);
local_image->filterType(LanczosFilter); //fast!
local_image->resize(Geometry(8, 8)); //64 pixels
ssize_t n = 8;
ssize_t m = 8;
Pixels view(*img);
Pixels view(*local_image);
int intensity = 0;
int numpixels = (int)(n*m);
int chan = (int)img->channels();
int chan = (int)local_image->channels();
const Quantum *p = view.getConst(0, 0, n, m); //entire image
bitset<64> retval(0);
int prev = p[0]; //so we always start with a 0
@@ -274,6 +281,7 @@ public:
retval <<= 1;
}
}
delete local_image;
return retval;
}
unsigned long long distance(bitset<64> a, bitset<64> b) {
@@ -294,15 +302,16 @@ public:
class threshold : public Descriptor {
public:
bitset<64> feature(Image* img) {
img->type(GrayscaleType);
img->filterType(LanczosFilter); //fast!
img->resize(Geometry(8, 8)); //64 pixels
img->adaptiveThreshold(2, 2); //Thresholding in a moving 2*2 neighborhood
Image* local_image = new Image(*img);
local_image->type(GrayscaleType);
local_image->filterType(LanczosFilter); //fast!
local_image->resize(Geometry(8, 8)); //64 pixels
local_image->adaptiveThreshold(2, 2); //Thresholding in a moving 2*2 neighborhood
ssize_t n = 8;
ssize_t m = 8;
Pixels view(*img);
Pixels view(*local_image);
int numpixels = (int)(n*m);
int chan = (int)img->channels();
int chan = (int)local_image->channels();
const Quantum *p = view.getConst(0, 0, n, m); //entire image
bitset<64> retval(0);
for (ssize_t j = 0; j < m; j++) {
@@ -318,6 +327,7 @@ public:
//cout << endl;
}
//cout << "----" << endl << endl;
delete local_image;
return retval;
}
unsigned long long distance(bitset<64> a, bitset<64> b) {
@@ -338,7 +348,8 @@ public:
class DCTPearson: public Descriptor {
public:
bitset<64> feature(Image* img) {
double* converted = CalculateDCT(img);
Image* local_image = new Image(*img);
double* converted = CalculateDCT(local_image);
double prev = 0;
bitset<64> retval(0);
@@ -349,6 +360,7 @@ public:
retval <<= 1;
prev = converted[i];
}
delete local_image;
return retval;
}
unsigned long long distance(bitset<64> a, bitset<64> b) {
@@ -366,7 +378,8 @@ public:
class DCTMedian : public Descriptor {
public:
bitset<64> feature(Image* img) {
double* converted = CalculateDCT(img);
Image* local_image = new Image(*img);
double* converted = CalculateDCT(local_image);
double bullshit[64];
for (ssize_t i = 0; i < 64; i++) {
bullshit[i] = converted[i];
@@ -380,6 +393,7 @@ public:
if (converted[i] > median)
retval |= bitset<64>(1);
}
delete local_image;
return retval;
}
unsigned long long distance(bitset<64> a, bitset<64> b) {