From 01c607cd3e8c8ec0b473d099413995b27a8a3f28 Mon Sep 17 00:00:00 2001 From: Andrey Sidorov Date: Mon, 31 Mar 2014 14:06:11 +1100 Subject: [PATCH] cleanups --- lib/ext/render.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/ext/render.js b/lib/ext/render.js index 6952f11..97c6668 100644 --- a/lib/ext/render.js +++ b/lib/ext/render.js @@ -118,7 +118,6 @@ exports.requireExt = function(display, callback) ext.CreatePicture = function(pid, drawable, pictformat, values) { - console.log([pid, drawable, pictformat, values]); X.seq_num++; var mask = 0; var reqLen = 5; // + (values + pad)/4 @@ -132,7 +131,6 @@ exports.requireExt = function(display, callback) { var name = valueList[i][0]; var val = values[name]; - console.log([name, val]); if (val) { mask |= (1 << i); params.push(val); @@ -149,7 +147,6 @@ exports.requireExt = function(display, callback) params[2] = reqLen; params[6] = mask; } - console.log(['CreatePicture', format, params]); X.pack_stream.pack(format, params); X.pack_stream.flush(); } @@ -178,17 +175,16 @@ exports.requireExt = function(display, callback) } */ params[2] = reqLen; - //console.log([format, params]); X.pack_stream.pack(format, params); X.pack_stream.flush(); - } + }; ext.CreateSolidFill = function(pid, r, g, b, a) - { + { X.seq_num++; X.pack_stream.pack('CCSLSSSS', [ext.majorOpcode, 33, 4, pid, floatToFix(r), floatToFix(g), floatToFix(b), floatToFix(a)]); X.pack_stream.flush(); - } + }; ext.RadialGradient = function(pid, p1, p2, r1, r2, stops) { @@ -220,10 +216,9 @@ exports.requireExt = function(display, callback) for (var j=0; j < 4; ++j) params.push(stops[i][1][j]); } - //console.log([format, params]); X.pack_stream.pack(format, params); X.pack_stream.flush(); - } + }; ext.LinearGradient = function(pid, p1, p2, stops) { @@ -253,7 +248,6 @@ exports.requireExt = function(display, callback) for (var j=0; j < 4; ++j) params.push(stops[i][1][j]); } - //console.log([format, params]); X.pack_stream.pack(format, params); X.pack_stream.flush(); } @@ -407,8 +401,8 @@ exports.requireExt = function(display, callback) //AddGlyphsFromPicture, opcode=21 (not in spec) // FreeGlyps - opcode 22 - // gsid(L) , glyphs.length (L) + each glyph id (L) - // + // gsid(L) , glyphs.length (L) + each glyph id (L) + // // each GlyphEle: // 1 byte - number of glyphs @@ -464,7 +458,7 @@ exports.requireExt = function(display, callback) case 'number': // glyphset id X.pack_stream.pack('CxxxL', [0xff, g]); break; - + } } X.pack_stream.flush(); @@ -474,7 +468,7 @@ exports.requireExt = function(display, callback) { return ext.CompositeGlyphs(8, op, src, dst, maskFormat, gsid, srcX, srcY, glyphs); }; - + // TODO: not ready yet. fix format in CompositeGlyphs to support 16 bit chars ext.CompositeGlyphs16 = function(op, src, dst, maskFormat, gsid, srcX, srcY, glyphs) { @@ -506,7 +500,6 @@ exports.requireExt = function(display, callback) // 11 - colormap or none ext.QueryPictFormat(function(err, formats) { - console.log(formats); for (var i=0; i < formats.formats.length; ++i) { var f = formats.formats[i]; if (f[2] == 1 && f[10] == 1)