Commit 12246d3a authored by jaycox's avatar jaycox
Browse files

removed cubic_interpolation variable. use the interpolation_type variable


	* app/gimprc.[ch]: removed cubic_interpolation variable.
	* app/transform_core.c: use the interpolation_type variable
	instead of the old cubic_interpolation variable.
parent 5d6799eb
Sat Aug 21 01:18:08 1999 Jay Cox (jaycox@earthlink.net)
* app/gimprc.[ch]: removed cubic_interpolation variable.
* app/transform_core.c: use the interpolation_type variable
instead of the old cubic_interpolation variable.
Sat Aug 21 21:03:00 CST 1999 Seth J. Burgess <sjburges@gimp.org>
* plug-ins/common/jpeg.c: committed patch by Steinar Gunderson
......@@ -47,7 +53,7 @@ Fri Aug 20 02:17:18 1999 Jay Cox (jaycox@earthlink.net)
* app/paint_funcs.c: rewrote scale_region. It now behaves
correctly on images with alpha, no longer leaves an artifact on the
right edge of images when scailing up, and runs signifigantly
right edge of images when scaling up, and runs significantly
faster.
Fri Aug 20 11:21:57 1999 ape@gandalf.spacetec.no (Asbjorn Pettersen)
......
......@@ -130,7 +130,6 @@ int show_rulers = TRUE;
int show_statusbar = TRUE;
GUnit default_units = UNIT_INCH;
int auto_save = TRUE;
int cubic_interpolation = FALSE;
InterpolationType interpolation_type = LINEAR_INTERPOLATION;
int confirm_on_close = TRUE;
int save_session_info = TRUE;
......
......@@ -56,7 +56,6 @@ extern int show_rulers;
extern GUnit default_units;
extern int show_statusbar;
extern int auto_save;
extern int cubic_interpolation;
extern InterpolationType interpolation_type;
extern int confirm_on_close;
extern int default_width, default_height;
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include <math.h>
#include "appenv.h"
......@@ -1139,7 +1140,8 @@ transform_core_do (GImage *gimage,
alpha = 0;
/* turn interpolation off for simple transformations (e.g. rot90) */
if (gimp_matrix_is_simple (matrix))
if (gimp_matrix_is_simple (matrix)
|| interpolation_type == NEAREST_NEIGHBOR_INTERPOLATION)
interpolation = FALSE;
/* Get the background color */
......@@ -1223,7 +1225,7 @@ transform_core_do (GImage *gimage,
/* initialise the pixel_surround accessor */
if (interpolation) {
if (cubic_interpolation) {
if (interpolation_type == CUBIC_INTERPOLATION) {
pixel_surround_init(&surround, float_tiles, 4, 4, bg_col);
} else {
pixel_surround_init(&surround, float_tiles, 2, 2, bg_col);
......@@ -1279,7 +1281,7 @@ transform_core_do (GImage *gimage,
if (interpolation)
{
if (cubic_interpolation)
if (interpolation_type == CUBIC_INTERPOLATION)
{
/* ttx & tty are the subpixel coordinates of the point in the original
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include <math.h>
#include "appenv.h"
......@@ -1139,7 +1140,8 @@ transform_core_do (GImage *gimage,
alpha = 0;
/* turn interpolation off for simple transformations (e.g. rot90) */
if (gimp_matrix_is_simple (matrix))
if (gimp_matrix_is_simple (matrix)
|| interpolation_type == NEAREST_NEIGHBOR_INTERPOLATION)
interpolation = FALSE;
/* Get the background color */
......@@ -1223,7 +1225,7 @@ transform_core_do (GImage *gimage,
/* initialise the pixel_surround accessor */
if (interpolation) {
if (cubic_interpolation) {
if (interpolation_type == CUBIC_INTERPOLATION) {
pixel_surround_init(&surround, float_tiles, 4, 4, bg_col);
} else {
pixel_surround_init(&surround, float_tiles, 2, 2, bg_col);
......@@ -1279,7 +1281,7 @@ transform_core_do (GImage *gimage,
if (interpolation)
{
if (cubic_interpolation)
if (interpolation_type == CUBIC_INTERPOLATION)
{
/* ttx & tty are the subpixel coordinates of the point in the original
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment