#include <assert.h>
#include "filter.h"
+#include "panolib.h"
#include "utils_math.h"
#include "utils_image.h"
matrix_matrix_mult( dummy, my, m);
} /* void SetMatrix */
-/*
- * Extract image from pano in TrPtr->src using parameters in prefs (ignore
- * image parameters in TrPtr)
- */
-typedef enum interpolator_e
+#if 0
+static double lanczos (double x)
{
- NNEIGHBOUR,
- BILINEAR
-} interpolator_t;
+ static double table[257];
+
+ assert ((x >= 0.0) && (x <= 1.0));
+
+ if (table[0] != 1.0)
+ {
+ int i;
+
+ table[0] = 1.0;
+ for (i = 1; i <= 256; i++)
+ {
+ double t = ((double) i) / 256.0;
+ table[i] = 2 * sin (M_PI * t) * sin (M_PI_2 * t) / (M_PI * M_PI * t * t);
+ }
+ }
+
+ return (table[(int) (0.5 + 256.0 * x)]);
+} /* double lanczos */
+#endif
static int copy_pixel (ui_image_t *dest, const ui_image_t *src,
int x_dest, int y_dest,
{
uint32_t pixel_dest = (y_dest * dest->width) + x_dest;
- interp = NNEIGHBOUR;
+ assert (x_src_fp >= 0.0);
- if (interp == NNEIGHBOUR)
+ if (y_src_fp < 0.0)
+ y_src_fp = 0.0;
+
+ if (interp == BILINEAR)
+ {
+ int x_src_left;
+ int x_src_right;
+ int y_src_top;
+ int y_src_bottom;
+
+ double x_right_frac;
+ double y_bottom_frac;
+
+ int i;
+
+ x_src_left = (int) x_src_fp;
+ x_src_right = (x_src_left + 1) % src->width;
+
+ y_src_top = (int) y_src_fp;
+ y_src_bottom = y_src_top + 1;
+ if (y_src_bottom >= src->height)
+ y_src_bottom = src->height - 1;
+
+ x_right_frac = x_src_fp - x_src_left;
+ y_bottom_frac = y_src_fp - y_src_top;
+
+ /*
+ * The polynomial function
+ * 2x^3 - 3x^2 + 1
+ * is similar to the Lanczos function, but much easier to compute. It's
+ * applied here to improve sharpness.
+ */
+ {
+ double t = x_src_fp - x_src_left;
+ x_right_frac = -2.0 * t * t * t + 3.0 * t * t;
+
+ t = y_src_fp - y_src_top;
+ y_bottom_frac = -2.0 * t * t * t + 3.0 * t * t;
+ }
+
+ assert ((x_right_frac >= 0.0) && (x_right_frac <= 1.0));
+ assert ((y_bottom_frac >= 0.0) && (y_bottom_frac <= 1.0));
+
+ for (i = 0; i < 3; i++)
+ {
+ uint8_t values[2][2];
+ double value_left;
+ double value_right;
+ double value_final;
+
+ values[0][0] = src->data[i][(y_src_top * src->width) + x_src_left];
+ values[0][1] = src->data[i][(y_src_top * src->width) + x_src_right];
+ values[1][0] = src->data[i][(y_src_bottom * src->width) + x_src_left];
+ values[1][1] = src->data[i][(y_src_bottom * src->width) + x_src_right];
+
+ value_left = (1.0 - y_bottom_frac) * values[0][0]
+ + y_bottom_frac * values[1][0];
+ value_right = (1.0 - y_bottom_frac) * values[0][1]
+ + y_bottom_frac * values[1][1];
+
+ value_final = (1.0 - x_right_frac) * value_left + x_right_frac * value_right;
+
+ assert ((value_final >= 0.0) && (value_final <= 255.0));
+
+ dest->data[i][pixel_dest] = (uint8_t) (value_final + 0.5);
+ }
+ }
+ else /* if (interp == NNEIGHBOUR) */
{
int x_src = (int) (x_src_fp + 0.5) % src->width;
int y_src = (int) (y_src_fp + 0.5) % src->height;
// must have been allocated and locked!
int pl_extract_view (ui_image_t *view, const ui_image_t *pano,
- double pitch, double yaw, double fov)
+ double pitch, double yaw, double fov, interpolator_t interp)
{
int x_dest, y_dest; // Loop through destination image
copy_pixel (view, pano,
dest_width_left + x_dest, dest_height_top + y_dest,
src_width_left + x_src_fp, src_height_top + y_src_fp,
- NNEIGHBOUR);
+ interp); /* FIXME */
}
}
return (0);
}
-#if 0
-void matrix_inv_mult( double m[3][3], double vector[3] )
-{
- register int i;
- register double v0 = vector[0];
- register double v1 = vector[1];
- register double v2 = vector[2];
-
- for(i=0; i<3; i++)
- {
- vector[i] = m[0][i] * v0 + m[1][i] * v1 + m[2][i] * v2;
- }
-}
-#endif
-
-#define ID_0 0xff
-#define ID_1 0xd8
-#define ID_2 0xff
-#define ID_3 0xe0
-#define ID_4 0x00
-#define ID_5 0x10
-#define ID_6 0x4a
-#define ID_7 0x46
-#define ID_8 0x49
-#define ID_9 0x46
-#define ID_10 0x00
-
-#define ID_LENGTH 11
-
-// Find last jpeg inside image; create and copy to file jpeg
-int extractJPEG( fullPath *image, fullPath *jpeg )
-{
- file_spec fnum;
- long count;
- unsigned char* im;
- int i, idx = -1;
- unsigned char ch;
-
- if( myopen( image, read_bin, fnum ) )
- return -1;
-
-
- count = 1; i=0; // Get file length
-
- while( count == 1 )
- {
- myread( fnum, count, &ch );
- if(count==1) i++;
- }
- myclose(fnum);
-
- count = i;
-
- im = (UCHAR*)malloc( count );
- if( im == NULL )
- {
- PrintError("Not enough memory");
- return -1;
- }
-
- if( myopen( image, read_bin, fnum ) )
- return -1;
-
- myread(fnum,count,im);
- myclose(fnum);
-
- if( i != count )
- return -1;
-
- count -= ID_LENGTH;
-
- for(i=0; i<count; i++)
- {
- if( im[i] == ID_0 && im[i+1] == ID_1 && im[i+2] == ID_2 && im[i+3] == ID_3
- && im[i+4] == ID_4 && im[i+5] == ID_5 && im[i+6] == ID_6 && im[i+7] == ID_7
- && im[i+8] == ID_8 && im[i+9] == ID_9 && im[i+10] == ID_10)
- idx = i;
- }
-
- if( idx == -1 ) // No jpeg found
- {
- free(im);
- return -1;
- }
-
- count = count + ID_LENGTH - idx;
-
- mycreate( jpeg, 'GKON','JPEG');
- if( myopen( jpeg, write_bin, fnum ) )
- return -1;
- mywrite( fnum, count, im+idx );
- free( im );
- myclose( fnum );
- return 0;
-}
-
-
/*
* vim: set tabstop=4 softtabstop=4 shiftwidth=4 :
*/
projects / libopano.git / blobdiff