wm: Meerwald/dct.c comparison

update to 0.5

author	Peter Meerwald <pmeerw@cosy.sbg.ac.at>
date	Tue, 14 Aug 2007 21:11:21 +0200
parents	be303a3f5ea8
children	f83ef905a63d

comparison

equal deleted inserted replaced

-:b92f06d9a967
+:acb6967ee76d
 fprintf(stderr, "dct_NxN: %d not a power of 2\n", N);
 exit(1);
 }
 }while((1<<dct_NxN_log2N)<N);
 if (dct_NxN_costable) free(dct_NxN_costable);
-dct_NxN_costable = (double*) malloc(N * sizeof(double));
+dct_NxN_costable = malloc(N * sizeof(double));
 #ifdef DEBUG
 if(!dct_NxN_costable){
 fprintf(stderr, "Unable to allocate C array\n");
 exit(1);
 }
 free(dct_NxN_tmp);
 N = width;
 M = height;
-dct_NxN_tmp = (double *) malloc(height * sizeof(double));
+dct_NxN_tmp = malloc(height * sizeof(double));
 #ifdef DEBUG
 if (!dct_NxN_tmp) {
 fprintf(stderr, "init_dct_NxN(): failed to allocate memory\n");
 exit(1);
 }
 int u,v;
 double two_over_sqrtncolsnrows = 2.0/sqrt((double) N*M);
 for (u=0; u < N; u++)
 for (v=0; v < M; v++)
-dcts[u][v] = ((int) pixels[u][v]-128);
+dcts[u][v] = ((int) pixels[u][v] - 128);
 for (u=0; u<=M-1; u++){
 fct_noscale(dcts[u]);
 }
 for (v=0; v<=N-1; v++){
 /*  MatrixMultiply( temp, input, Ct ); */
 for ( i = 0 ; i < NJPEG ; i++ ) {
 for ( j = 0 ; j < NJPEG ; j++ ) {
 temp[ i ][ j ] = 0.0;
 for ( k = 0 ; k < NJPEG ; k++ )
-temp[ i ][ j ] += ( (int) input[ i ][ k ]) *
+temp[ i ][ j ] += ( (int) input[ i ][ k ] - 128 ) *
 Ct[ k ][ j ];
 }
 }
 /*  MatrixMultiply( output, C, temp ); */
 for ( i = 0 ; i < NJPEG ; i++ ) {
 for ( j = 0 ; j < NJPEG ; j++ ) {
 temp1 = 0.0;
 for ( k = 0 ; k < NJPEG ; k++ )
 temp1 += Ct[ i ][ k ] * temp[ k ][ j ];
+temp1 += 128.0;
 output[i][j] = PIXELRANGE(ROUND(temp1));
 }
 }
 }

Mercurial > hg > wm