Merge commit 'upstream/4.6.1'

[debian/atlc] / src / non_gui / align_bitmap_image.c

diff --git a/src/non_gui/align_bitmap_image.c b/src/non_gui/align_bitmap_image.c
deleted file mode 100644 (file)
index 183c9a1..0000000
--- a/src/non_gui/align_bitmap_image.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* atlc - arbitrary transmission line calculator, for the analysis of
-transmission lines are directional couplers. 
-
-Copyright (C) 2002. Dr. David Kirkby, PhD (G8WRB).
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either package_version 2
-of the License, or (at your option) any later package_version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
-USA.
-
-Dr. David Kirkby, e-mail drkirkby at ntlworld.com 
-
-*/
-#include "config.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include "definitions.h"
-
-/* a vector of length W*H called 'unaligned_image' contains the data. 
-This is written to a vector 'byte_aligned_image', which in general is longer
-and is of length 'vector_aligned. This routine returns the lenght of the image, 
-once it have been byte-aligned 
-
-The image 'unaligned_image' is expected to have the top of the image at the top of the
-file. This routine puts the image, so the bottom of the image is at the beggining of the 
-vector 'byte_aligned_image' 
-*/
-
-int align_bitmap_image(int W,int H,unsigned char *unaligned_image,unsigned char *byte_aligned_image)
-{
-   int i, j, vector_aligned=0, vector_original=0;
-   /* put into the vector, in reverse order - i.e. from bottom to top */
-   for(j=0;j<H;j++)
-   {
-      for(i=0;i <W; ++i)
-      {
-        /* vector_aligned is the offset into the image that's padded
-        to allow 4-byte alignment */
-        /* offset is not, and so will allways be <=vector_offset */
-        if( (i==0) && (vector_aligned%4!=0) )
-           vector_aligned++;
-        if( (i==0) && (vector_aligned%4!=0) )
-           vector_aligned++;
-        if( (i==0) && (vector_aligned%4!=0) )
-           vector_aligned++; 
-        byte_aligned_image[vector_aligned]=unaligned_image[vector_original];
-        byte_aligned_image[vector_aligned+1]=unaligned_image[vector_original+1];
-        byte_aligned_image[vector_aligned+2]=unaligned_image[vector_original+2];
-         vector_original+=3;
-         vector_aligned+=3;
-      }
-   }
-   if( vector_aligned%4!=0 )
-      vector_aligned++;
-   if( vector_aligned%4!=0 )
-      vector_aligned++;
-   if( vector_aligned%4!=0 )
-      vector_aligned++;
-   return(vector_aligned);
-}