Cleanup

jviereck · Jun 24, 2012 · fa54e2b · fa54e2b
1 parent e594f52
commit fa54e2b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/lib/context2d.js b/lib/context2d.js
@@ -99,7 +99,6 @@ var parseFont = exports.parseFont = function(str){
   return cache[str] = font;
 };
 
-
 /**
  * Create a pattern from `Image` or `Canvas`.
  *

diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc
@@ -1625,7 +1625,6 @@ Context2d::PrepareTrueTypeFace(const Arguments &args) {
     return ThrowException(Exception::TypeError(String::New("TrueTypeFontFace expected")));
 
   Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
-  cairo_t *ctx = context->context();
 
   cairo_font_face_t *cr_face;
   TrueTypeFontFace *face = ObjectWrap::Unwrap<TrueTypeFontFace>(obj);
@@ -1635,9 +1634,6 @@ Context2d::PrepareTrueTypeFace(const Arguments &args) {
   vector<cairo_font_face_t*> *font_faces = context->font_faces();
   font_faces->insert(font_faces->end(), cr_face);
 
-  cairo_set_font_face(ctx, cr_face);
-  printf("=== PrepareTrueTypeFace %p %p %d\n", context, font_faces, int(font_faces->size()));
-
   return scope.Close(Number::New(font_faces->size() - 1));
 }
 
@@ -1712,7 +1708,7 @@ Context2d::SetFont(const Arguments &args) {
     w = CAIRO_FONT_WEIGHT_BOLD;
   }
 
-  cairo_select_font_face(ctx, *family, s, w);    
+  cairo_select_font_face(ctx, *family, s, w); 
 
   return Undefined();
 }

diff --git a/src/CanvasRenderingContext2d.h b/src/CanvasRenderingContext2d.h
@@ -16,7 +16,6 @@
 #include <cairo-ft.h>
 #include FT_FREETYPE_H
 
-#include <string>
 #include <vector>
 using namespace std;
 

diff --git a/src/TrueTypeFont.cc b/src/TrueTypeFont.cc
@@ -45,20 +45,20 @@ TrueTypeFontFace::New(const Arguments &args) {
   }
 
   String::AsciiValue filePath(args[0]);
-  int faceIdx =  int(args[1]->NumberValue());
+  int faceIdx = int(args[1]->NumberValue());
 
   FT_Face    ft_face; /* handle to face object */ 
   FT_Error   ft_error;
 
   if (_initLibrary) {
     _initLibrary = false;
-    ft_error = FT_Init_FreeType( &library ); 
+    ft_error = FT_Init_FreeType(&library); 
     if (ft_error) { 
       return ThrowException(Exception::Error(String::New("Could not load library")));
     } 
   } 
 
-  ft_error = FT_New_Face( library, *filePath, faceIdx, &ft_face ); 
+  ft_error = FT_New_Face(library, *filePath, faceIdx, &ft_face); 
   if (ft_error) { 
     return ThrowException(Exception::Error(String::New("Could not load font file")));    
   }

diff --git a/src/init.cc b/src/init.cc
@@ -29,3 +29,4 @@ init (Handle<Object> target) {
 }
 
 NODE_MODULE(canvas,init);
+