5 files changed, 7 insertions, 90 deletions
diff --git a/src/fastscale/CMakeLists.txt b/src/fastscale/CMakeLists.txt
index 66812fd..b057f5d 100644
--- a/src/fastscale/CMakeLists.txt
+++ b/src/fastscale/CMakeLists.txt
@@ -21,11 +21,6 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-# Force to use C compiler for asm_scale.S instead of ASM
-# because contains mixed code - ASM with C definitions
-set_source_files_properties( asm_scale.S PROPERTIES LANGUAGE C )
-
-# TODO add assembler flags here (2016-01-14, Fat-Zer)
 
 ##### fastscale (static) ########################
 
diff --git a/src/fastscale/Makefile.am b/src/fastscale/Makefile.am
deleted file mode 100644
index f7d806d..0000000
--- a/src/fastscale/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
-AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS)
-
-#CXXFLAGS = -fexceptions
-
-noinst_LTLIBRARIES = libfastscale.la
-
-libfastscale_la_SOURCES = \
-	scale.cpp \
-	asm_scale.S
-
-libfastscale_la_LIBADD = $(LIB_TDECORE) $(LIBTQT) $(LIBJPEG)
-
-METASOURCES = AUTO
diff --git a/src/fastscale/configure.in.in b/src/fastscale/configure.in.in
deleted file mode 100644
index ffd60fa..0000000
--- a/src/fastscale/configure.in.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Imlib/Mosfet scaling
-#
-AM_PROG_AS
-
-# MMX test duped from tdelibs/tdefx - it should be probably moved to admin/
-dnl -----------------------------------------------------
-dnl IA32 checks
-dnl -----------------------------------------------------
-
-gv_asm_defs=
-case $host_cpu in
-  i*86 )
-  AC_MSG_CHECKING(for assembler support for IA32 extensions)
- 
-  dnl MMX check
-  AC_TRY_COMPILE(, [ __asm__("pxor %mm0, %mm0") ],
-  [
-    echo $ECHO_N "MMX yes$ECHO_C"
-    AC_DEFINE_UNQUOTED(HAVE_X86_MMX, 1, [Define to 1 if the assembler supports MMX instructions.])
-    gv_asm_defs="$gv_asm_defs -DHAVE_X86_MMX"
-  ], [ echo $ECHO_N "MMX no$ECHO_C" ])
-
-  dnl SSE check
-  AC_TRY_COMPILE(,[ __asm__("xorps %xmm0, %xmm0") ],
-  [
-    echo $ECHO_N ", SSE yes$ECHO_C"
-    AC_DEFINE_UNQUOTED(HAVE_X86_SSE, 1, [Define to 1 if the assembler supports SSE instructions.])
-    gv_asm_defs="$gv_asm_defs -DHAVE_X86_SSE"
-  ], [ echo $ECHO_N ", SSE no$ECHO_C" ])
-
-  dnl SSE2 check
-  AC_TRY_COMPILE(, [ __asm__("xorpd %xmm0, %xmm0") ],
-  [
-    echo $ECHO_N ", SSE2 yes$ECHO_C"
-    AC_DEFINE_UNQUOTED(HAVE_X86_SSE2, 1, [Define to 1 if the assembler supports SSE2 instructions.])
-    gv_asm_defs="$gv_asm_defs -DHAVE_X86_SSE2"
-  ], [ echo $ECHO_N ", SSE2 no$ECHO_C" ])
- 
-  dnl 3DNOW check
-  AC_TRY_COMPILE(, [ __asm__("femms") ],
-  [
-    echo $ECHO_N ", 3DNOW yes$ECHO_C"
-    AC_DEFINE_UNQUOTED(HAVE_X86_3DNOW, 1, [Define to 1 if the assembler supports 3DNOW instructions.])
-    gv_asm_defs="$gv_asm_defs -DHAVE_X86_3DNOW"
-  ], [ echo $ECHO_N ", 3DNOW no$ECHO_C" ])
-  echo
-  ;;
-  powerpc )
-  AC_MSG_CHECKING(for assembler support for AltiVec instructions)
-  dnl AltiVec check
-  AC_TRY_COMPILE(, [ __asm__("mtspr 256, %0\n\t" "vand %%v0, %%v0, %%v0" : : "r"(-1) ) ],
-  [
-    echo $ECHO_N " yes$ECHO_C"
-    AC_DEFINE_UNQUOTED(HAVE_PPC_ALTIVEC, 1, [Define to 1 if the assembler supports AltiVec instructions.])
-    gv_asm_defs="$gv_asm_defs -DHAVE_PPC_ALTIVEC"
-  ], [ echo $ECHO_N ", AltiVec no$ECHO_C" ])
-  echo
-  ;;
-esac
-
-GV_ASM_DEFS="$gv_asm_defs"
-AC_SUBST(GV_ASM_DEFS)
diff --git a/src/fastscale/scale.cpp b/src/fastscale/scale.cpp
index e15c5da..62320bf 100644
--- a/src/fastscale/scale.cpp
+++ b/src/fastscale/scale.cpp
@@ -439,7 +439,7 @@ static void HorizontalFilter(const TQImage& source,TQImage& destination,
     stop,
     y;
 
-  register long
+  long
     i,
     x;
 
@@ -524,7 +524,7 @@ static void VerticalFilter(const TQImage& source,TQImage& destination,
     stop,
     x;
 
-  register long
+  long
     i,
     y;
 
@@ -738,13 +738,13 @@ TQImage SampleImage(const TQImage& image,const int columns,
   uchar
     *pixels;
 
-  register const uchar
+  const uchar
     *p;
 
-  register long
+  long
     x;
 
-  register uchar
+  uchar
     *q;
 
   /*
@@ -1920,7 +1920,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest,
 // }
 
 TQImage scale(const TQImage& image, int width, int height,
-	SmoothAlgorithm alg, TQ_ScaleMode mode, double blur )
+	SmoothAlgorithm alg, TQImage::ScaleMode mode, double blur )
 {
 	if( image.isNull()) return image.copy();
 	
diff --git a/src/fastscale/scale.h b/src/fastscale/scale.h
index 4742cb2..e02062a 100644
--- a/src/fastscale/scale.h
+++ b/src/fastscale/scale.h
@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Copied from gwenview/src/imageutils/imageutils.h
 Copyright 2000-2004 Aurélien Gāteau
@@ -28,7 +27,7 @@ namespace ImageUtils {
 	enum SmoothAlgorithm { SMOOTH_NONE, SMOOTH_FAST, SMOOTH_NORMAL, SMOOTH_BEST };
 
 	TQImage scale(const TQImage& image, int width, int height,
-		SmoothAlgorithm alg, TQ_ScaleMode mode = TQ_ScaleFree, double blur = 1.0);
+		SmoothAlgorithm alg, TQImage::ScaleMode mode = TQImage::ScaleFree, double blur = 1.0);
 }
 
 #endif