rqr 0.1.1 → 0.2.0

data/ext/rqr/qr_draw_ps.cpp

@@ -1,12 +1,5 @@
 #include "qr_draw_ps.h"
 
-//=================================================================================
-// QRDrawPS::QRDrawPS
-//=================================================================================
-QRDrawPS::QRDrawPS()
-{
-}
-
 //=============================================================================
 // QRDrawPS::draw
 //=============================================================================
@@ -46,34 +39,34 @@ int QRDrawPS::write2(unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE])
 	
 	if((stream=fopen(this->filename, "wb")) == NULL) return(1);
 
-	/* ダミーヘッダー書き込み */
+	/* �_�~�[�w�b�_�[�������� */
 	this->write_header(stream);
 	
-	/* TIFF書き込み */
+	/* TIFF�������� */
 	this->write_preview(stream, data);
 	fclose(stream);
 	
-	/* EPS書き込み */
+	/* EPS�������� */
 	this->write(data, "a");
 	
-	/* EPSサイズ算出 */
+	/* EPS�T�C�Y�Z�o */
 	stat(this->filename, &st);
 	unsigned int esize = st.st_size - (this->tsize+30);
 	
-	/* ヘッダー書き換え */
+	/* �w�b�_�[�������� */
 	if((stream=fopen(this->filename, "rb+")) == NULL) return(1);
 
-	/* PS開始位置 */
+	/* PS�J�n�ʒu */
 	fseek(stream, 4, SEEK_SET);
 	this->littleEndian(30+this->tsize, lt);
 	fprintf(stream, "%c%c%c%c", lt[0], lt[1], lt[2], lt[3]);
 
-	/* PS長 */
+	/* PS�� */
 	fseek(stream, 8, SEEK_SET);
 	this->littleEndian(esize, lt);
 	fprintf(stream, "%c%c%c%c", lt[0], lt[1], lt[2], lt[3]);
 	
-	/* TIFFプレビュー長 */
+	/* TIFF�v���r���[�� */
 	fseek(stream, 24, SEEK_SET);
 	this->littleEndian(this->tsize, lt);
 	fprintf(stream, "%c%c%c%c", lt[0], lt[1], lt[2], lt[3]);
@@ -93,27 +86,27 @@ void QRDrawPS::write_header(FILE *stream)
 {
 	unsigned char lt[4];
 	
-	/* ナミモニ */
+	/* �i�~���j */
 	fprintf(stream, "%c%c%c%c", 0xC5, 0xD0, 0xD3, 0xC6);
 	
-	/* PostScript開始位置 */
+	/* PostScript�J�n�ʒu */
 	fprintf(stream, "%c%c%c%c", 0x00, 0x00, 0x00, 0x00);
 	
-	/* PostScript長さ */
+	/* PostScript���� */
 	fprintf(stream, "%c%c%c%c", 0x00, 0x00, 0x00, 0x00);
 
 	/* MetaFile */
 	fprintf(stream, "%c%c%c%c", 0x00, 0x00, 0x00, 0x00);
 	fprintf(stream, "%c%c%c%c", 0x00, 0x00, 0x00, 0x00);
 	
-	/* TIFFプレビュー開始位置 */
+	/* TIFF�v���r���[�J�n�ʒu */
 	littleEndian(30, lt);
 	fprintf(stream, "%c%c%c%c", lt[0], lt[1], lt[2], lt[3]);
 	
-	/* TIFFプレビュー長 */
+	/* TIFF�v���r���[�� */
 	fprintf(stream, "%c%c%c%c", 0x00, 0x00, 0x00, 0x00);
 
-	/* チェックサム */
+	/* �`�F�b�N�T�� */
 	fprintf(stream, "%c%c", 0xff, 0xff);
 }
 
@@ -142,7 +135,7 @@ int QRDrawPS::write_preview(FILE *stream, unsigned char data[MAX_MODULESIZE][MAX
 	tmpnam(tmp);
 	if( tif.draw(tmp, this->msize, this->ssize, data, NULL) ) return(1);
 	
-	/* TIFFをオープンしてファイルサイズを取得する */
+	/* TIFF���I�[�v�����ăt�@�C���T�C�Y���擾���� */
 	if((t=fopen(tmp, "rb")) == NULL){
 		remove(tmp);
 		return(1);
@@ -151,7 +144,7 @@ int QRDrawPS::write_preview(FILE *stream, unsigned char data[MAX_MODULESIZE][MAX
 	this->tsize = ftell(t);
 	fseek(t, 0, SEEK_SET);
 
-	/* TIFF本体の書き込み */
+	/* TIFF�{�̂̏������� */
 	p = (unsigned char *)malloc(this->tsize);
 	fread(p, 1, this->tsize, t);
 	fwrite(p, 1, this->tsize, stream);
@@ -209,7 +202,7 @@ int QRDrawPS::write(unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE], char *mo
 	fprintf(stream, "1 setgray\n");
 	fprintf(stream, "fill\n");
 	
-	// ドット描画
+	// �h�b�g�`��
 	for(i=0; i<this->ssize; i++){
 		for(j=0; j<this->ssize; j++) fprintf(stream, "%d ", data[j][i]);
 		fprintf(stream, "\n");

data/ext/rqr/qr_draw_ps.h

@@ -13,7 +13,7 @@
 #endif
 
 //=============================================================================
-// QRDrawPS クラス
+// QRDrawPS �N���X
 //=============================================================================
 class QRDrawPS : public QRDraw
 {
@@ -28,7 +28,8 @@ class QRDrawPS : public QRDraw
 		void littleEndian(int data, unsigned char *lt);
 		
 	public:
-		QRDrawPS();
+		QRDrawPS(){}
+		~QRDrawPS(){}
 		int draw(char *filename, int modulesize, int symbolsize, 
 							unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE], void *opt);
 };

data/ext/rqr/qr_draw_tiff.cpp

@@ -1,32 +1,5 @@
 #include "qr_draw_tiff.h"
 
-//=================================================================================
-// QRDrawPNG::QRDrawPNG
-//=================================================================================
-QRDrawTIFF::QRDrawTIFF()
-{
-#ifdef USE_TIFF
-	bit_image  = NULL;
-#endif
-}
-
-//=================================================================================
-// QRDrawTIFF::~QRDrawTIFF
-//=================================================================================
-QRDrawTIFF::~QRDrawTIFF()
-{
-#ifdef USE_TIFF
-	int i;
-	
-	if(bit_image){
-		for(i=0; i<this->rsize; i++){
-			free(bit_image[i]);
-		}
-		free(bit_image);
-	}
-#endif
-}
-
 //=============================================================================
 // QRDrawPNG::draw
 //=============================================================================
@@ -53,7 +26,7 @@ int QRDrawTIFF::raster(unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE])
 #ifdef USE_TIFF
 	int bitw = (int)ceil(this->rsize/8) + 1;
 	
-	/* 実際にデータを置く領域を確保 */
+	/* ���ۂɃf�[�^��u���̈���m�� */
 	bit_image = (unsigned char **)malloc(sizeof(unsigned char *) * this->rsize);
 	for(int i=0; i<this->rsize; i++){
 		bit_image[i] = (unsigned char *)malloc(bitw);
@@ -61,12 +34,12 @@ int QRDrawTIFF::raster(unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE])
 	}
 
 	for(int i=0; i<this->ssize; i++){
-		int dp  = MARGIN_SIZE*this->msize / 8;			//横方向のバイト位置
-		int sht =(MARGIN_SIZE*this->msize % 8) ? 3 : 7;	//ビットシフト
-		unsigned char c = 0;							//1バイトの構成を保存
+		int dp  = MARGIN_SIZE*this->msize / 8;			//�������̃o�C�g�ʒu
+		int sht =(MARGIN_SIZE*this->msize % 8) ? 3 : 7;	//�r�b�g�V�t�g
+		unsigned char c = 0;							//1�o�C�g�̍\����ۑ�
 
 		for(int j=0; j<this->ssize; j++){
-			/* 1行分生成 */
+			/* 1�s������ */
 			for(int k=0; k<this->msize; k++){
 				c += (data[j][i] << sht);
 				sht--;
@@ -80,7 +53,7 @@ int QRDrawTIFF::raster(unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE])
 				}
 			}
 		}
-		/* モジュールサイズ分縦方向に増やす */
+		/* ���W���[���T�C�Y���c�����ɑ��₷ */
 		for(int k=1; k<this->msize; k++){
 			memcpy(bit_image[(i+MARGIN_SIZE)*this->msize+k], bit_image[(i+MARGIN_SIZE)*this->msize], bitw);
 		}
@@ -104,21 +77,21 @@ int QRDrawTIFF::write()
 	/* Open the TIFF file */
 	if( (tiff=TIFFOpen(this->filename, "w")) == NULL ) return(1);
 
-	/* タグ */
-	TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, this->rsize);				/* 幅(ピクセル数) */
-	TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, this->rsize);				/* 高(スキャンライン数) */
-	TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_NONE);			/* 圧縮モード */
-	TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 1);						/* ピクセルの深さ */
-	TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);	/* カラータイプ */
-	TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);						/* カラープレーン数 */
-	TIFFSetField(tiff, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);		/* スキャン方向 */
+	/* �^�O */
+	TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, this->rsize);				/* ��(�s�N�Z����) */
+	TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, this->rsize);				/* ��(�X�L�������C����) */
+	TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_NONE);			/* ���k���[�h */
+	TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 1);						/* �s�N�Z���̐[�� */
+	TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);	/* �J���[�^�C�v */
+	TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);						/* �J���[�v���[���� */
+	TIFFSetField(tiff, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);		/* �X�L�������� */
 	TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);		/* ? */
-	TIFFSetField(tiff, TIFFTAG_XRESOLUTION, 72.0);						/* 解像度 */
-	TIFFSetField(tiff, TIFFTAG_YRESOLUTION, 72.0);						/* 解像度 */
-	TIFFSetField(tiff, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);			/* 解像度の単位(RESUNIT_INCH:インチ) */
-	TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, this->rsize);				/* 1ストリップに何行格納されるか */
+	TIFFSetField(tiff, TIFFTAG_XRESOLUTION, 72.0);						/* �𑜓x */
+	TIFFSetField(tiff, TIFFTAG_YRESOLUTION, 72.0);						/* �𑜓x */
+	TIFFSetField(tiff, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);			/* �𑜓x�̒P��(RESUNIT_INCH:�C���`) */
+	TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, this->rsize);				/* 1�X�g���b�v�ɉ��s�i�[����邩 */
 	
-	/* 1行ずつ書き込み */
+	/* 1�s���������� */
 	for(i=0 ; i<this->rsize ; i++){
 		if( TIFFWriteScanline(tiff, bit_image[i], i, 0) < 0 ){
 			TIFFClose(tiff);

data/ext/rqr/qr_draw_tiff.h

@@ -11,7 +11,7 @@
 #endif
 
 //=============================================================================
-// QRDrawTIFF クラス
+// QRDrawTIFF �N���X
 //=============================================================================
 class QRDrawTIFF : public QRDraw
 {
@@ -20,8 +20,8 @@ class QRDrawTIFF : public QRDraw
 		int write();
 		
 	public:
-		QRDrawTIFF();
-		~QRDrawTIFF();
+		QRDrawTIFF(){}
+		~QRDrawTIFF(){}
 		int draw(char *filename, int modulesize, int symbolsize,
                       unsigned char data[MAX_MODULESIZE][MAX_MODULESIZE], void *opt);
 };

data/ext/rqr/qr_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.29
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -119,7 +119,7 @@ private:
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
@@ -216,7 +216,7 @@ private:
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
@@ -229,7 +229,7 @@ private:
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "2"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -828,21 +828,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 #endif
 
-/* RSTRING_LEN, etc are new in Ruby 1.9, but ->ptr and ->len no longer work */
-/* Define these for older versions so we can just write code the new way */
-#ifndef RSTRING_LEN
-# define RSTRING_LEN(x) RSTRING(x)->len
-#endif
-#ifndef RSTRING_PTR
-# define RSTRING_PTR(x) RSTRING(x)->ptr
-#endif
-#ifndef RARRAY_LEN
-# define RARRAY_LEN(x) RARRAY(x)->len
-#endif
-#ifndef RARRAY_PTR
-# define RARRAY_PTR(x) RARRAY(x)->ptr
-#endif
-
 /*
  * Need to be very careful about how these macros are defined, especially
  * when compiling C++ code or C code with an ANSI C compiler.
@@ -886,10 +871,10 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define StringValue(s) RB_STRING_VALUE(s)
 #endif
 #ifndef StringValuePtr
-#define StringValuePtr(s) RSTRING_PTR(RB_STRING_VALUE(s))
+#define StringValuePtr(s) RSTRING(RB_STRING_VALUE(s))->ptr
 #endif
 #ifndef StringValueLen
-#define StringValueLen(s) RSTRING_LEN(RB_STRING_VALUE(s))
+#define StringValueLen(s) RSTRING(RB_STRING_VALUE(s))->len
 #endif
 #ifndef SafeStringValue
 #define SafeStringValue(v) do {\
@@ -1318,7 +1303,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
         downcast methods. */
       if (obj != Qnil) {
         VALUE value = rb_iv_get(obj, "__swigtype__");
-        char* type_name = RSTRING_PTR(value);
+        char* type_name = RSTRING(value)->ptr;
 				
         if (strcmp(type->name, type_name) == 0) {
           return obj;
@@ -1567,8 +1552,7 @@ static swig_module_info swig_module = {swig_types, 14, 0, 0, 0, 0};
 
 static VALUE mQR;
 
-#define SWIGVERSION 0x010331 
-#define SWIG_VERSION SWIGVERSION
+#define SWIGVERSION 0x010329 
 
 
 #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
@@ -1610,7 +1594,7 @@ SWIG_From_int  (int value)
 
 
 SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
+SWIG_pchar_descriptor()
 {
   static int init = 0;
   static swig_type_info* info = 0;
@@ -1631,7 +1615,7 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
     char *cstr = STR2CSTR(obj);
     
-    size_t size = RSTRING_LEN(obj) + 1;
+    size_t size = RSTRING(obj)->len + 1;
     if (cptr)  {
       if (alloc) {
 	if (*alloc == SWIG_NEWOBJ) {
@@ -1776,7 +1760,7 @@ _wrap_QRDraw_setup(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "setup" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "setup" "', argument " "3"" of type '" "int""'");
@@ -1831,7 +1815,7 @@ _wrap_QRDraw_draw(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "draw" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "draw" "', argument " "3"" of type '" "int""'");
@@ -1861,6 +1845,27 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_QRDraw_close(int argc, VALUE *argv, VALUE self) {
+  QRDraw *arg1 = (QRDraw *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_QRDraw, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "close" "', argument " "1"" of type '" "QRDraw *""'"); 
+  }
+  arg1 = reinterpret_cast< QRDraw * >(argp1);
+  (arg1)->close();
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 swig_class cQRDrawJPEG;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -1935,7 +1940,7 @@ _wrap_QRDrawJPEG_draw(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "draw" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "draw" "', argument " "3"" of type '" "int""'");
@@ -2039,7 +2044,7 @@ _wrap_QRDrawPNG_draw(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "draw" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "draw" "', argument " "3"" of type '" "int""'");
@@ -2103,6 +2108,11 @@ fail:
 }
 
 
+SWIGINTERN void
+free_QRDrawPS(QRDrawPS *arg1) {
+    delete arg1;
+}
+
 SWIGINTERN VALUE
 _wrap_QRDrawPS_draw(int argc, VALUE *argv, VALUE self) {
   QRDrawPS *arg1 = (QRDrawPS *) 0 ;
@@ -2138,7 +2148,7 @@ _wrap_QRDrawPS_draw(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "draw" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "draw" "', argument " "3"" of type '" "int""'");
@@ -2168,11 +2178,6 @@ fail:
 }
 
 
-SWIGINTERN void
-free_QRDrawPS(QRDrawPS *arg1) {
-    delete arg1;
-}
-
 swig_class cQRDrawTIFF;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -2247,7 +2252,7 @@ _wrap_QRDrawTIFF_draw(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "draw" "', argument " "2"" of type '" "char *""'");
   }
-  arg2 = reinterpret_cast< char * >(buf2);
+  arg2 = buf2;
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "draw" "', argument " "3"" of type '" "int""'");
@@ -3354,7 +3359,7 @@ _wrap_CQR_Encode_EncodeData__SWIG_0(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "EncodeData" "', argument " "6"" of type '" "LPCSTR""'");
   }
-  arg6 = reinterpret_cast< LPCSTR >(buf6);
+  arg6 = buf6;
   ecode7 = SWIG_AsVal_int(argv[5], &val7);
   if (!SWIG_IsOK(ecode7)) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "EncodeData" "', argument " "7"" of type '" "int""'");
@@ -3426,7 +3431,7 @@ _wrap_CQR_Encode_EncodeData__SWIG_1(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "EncodeData" "', argument " "6"" of type '" "LPCSTR""'");
   }
-  arg6 = reinterpret_cast< LPCSTR >(buf6);
+  arg6 = buf6;
   result = (BOOL)(arg1)->EncodeData(arg2,arg3,arg4,arg5,arg6);
   vresult = SWIG_From_bool(static_cast< bool >(result));
   if (alloc6 == SWIG_NEWOBJ) delete[] buf6;
@@ -3631,7 +3636,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * structures together.
  *
  * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop through that array, and handle each type individually.
+ * array. We just loop though that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
  * cast linked list. The cast data is initially stored in something like a
@@ -3669,49 +3674,32 @@ extern "C" {
 #define SWIGRUNTIME_DEBUG
 #endif
 
-
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
-  swig_module_info *module_head, *iter;
-  int found;
+  swig_module_info *module_head;
+  static int init_run = 0;
 
   clientdata = clientdata;
 
-  /* check to see if the circular list has been setup, if not, set it up */
-  if (swig_module.next==0) {
-    /* Initialize the swig_module */
-    swig_module.type_initial = swig_type_initial;
-    swig_module.cast_initial = swig_cast_initial;
-    swig_module.next = &swig_module;
-  }
+  if (init_run) return;
+  init_run = 1;
+
+  /* Initialize the swig_module */
+  swig_module.type_initial = swig_type_initial;
+  swig_module.cast_initial = swig_cast_initial;
 
   /* Try and load any already created modules */
   module_head = SWIG_GetModule(clientdata);
-  if (!module_head) {
-    /* This is the first module loaded for this interpreter */
-    /* so set the swig module into the interpreter */
-    SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
-  } else {
-    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
-    iter=module_head;
-    do {
-      if (iter==&swig_module) {
-        found=1;
-        break;
-      }
-      iter=iter->next;
-    } while (iter!= module_head);
-
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
+  if (module_head) {
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
+  } else {
+    /* This is the first module loaded */
+    swig_module.next = &swig_module;
+    SWIG_SetModule(clientdata, &swig_module);
   }
-
+		 
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -3869,6 +3857,7 @@ SWIGEXPORT void Init_QR(void) {
   rb_undef_alloc_func(cQRDraw.klass);
   rb_define_method(cQRDraw.klass, "setup", VALUEFUNC(_wrap_QRDraw_setup), -1);
   rb_define_method(cQRDraw.klass, "draw", VALUEFUNC(_wrap_QRDraw_draw), -1);
+  rb_define_method(cQRDraw.klass, "close", VALUEFUNC(_wrap_QRDraw_close), -1);
   cQRDraw.mark = 0;
   cQRDraw.destroy = (void (*)(void *)) free_QRDraw;
   cQRDraw.trackObjects = 0;