diff options
3 files changed, 13 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java index 3bab8a1be1..18af221b75 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java @@ -47,10 +47,10 @@ void draw(Theme theme, GC gc, Rectangle bounds) { int arrow_width = MIN_ARROW_SIZE; int arrow_height = ARROW_HEIGHT; int x_border = xthickness + focus_padding; - int y_border = ythickness + focus_padding; + //int y_border = ythickness + focus_padding; if (interior_focus == 0) { x_border += focus_line_width; - y_border += focus_line_width; + //y_border += focus_line_width; } int arrow_button_width = arrow_width + x_border * 2; int arrow_button_x = x + width - arrow_button_width; @@ -109,13 +109,14 @@ int hit(Theme theme, Point position, Rectangle bounds) { int ythickness = OS.gtk_style_get_xthickness(gtkStyle); int arrow_width = MIN_ARROW_SIZE; int x_border = xthickness + focus_padding; - int y_border = ythickness + focus_padding; + //int y_border = ythickness + focus_padding; if (interior_focus == 0) { x_border += focus_line_width; - y_border += focus_line_width; + //y_border += focus_line_width; } int arrow_button_width = arrow_width + x_border * 2; int arrow_button_x = bounds.x + bounds.width - arrow_button_width; + Rectangle arrowRect = new Rectangle(arrow_button_x, bounds.y, arrow_button_width, bounds.height); if (arrowRect.contains(position)) return DrawData.COMBO_ARROW; return DrawData.WIDGET_WHOLE; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGDecoder.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGDecoder.java index 54d6daa793..110adba428 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGDecoder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGDecoder.java @@ -2300,16 +2300,16 @@ static void jinit_d_coef_controller (jpeg_decompress_struct cinfo, boolean need_ /* Allocate a full-image virtual array for each component, */ /* padded to a multiple of samp_factor DCT blocks in each direction. */ /* Note we ask for a pre-zeroed array. */ - int ci, access_rows; + int ci; //, access_rows; jpeg_component_info compptr; for (ci = 0; ci < cinfo.num_components; ci++) { compptr = cinfo.comp_info[ci]; - access_rows = compptr.v_samp_factor; + //access_rows = compptr.v_samp_factor; //#ifdef BLOCK_SMOOTHING_SUPPORTED /* If block smoothing could be used, need a bigger window */ if (cinfo.progressive_mode) - access_rows *= 3; + //access_rows *= 3; //#endif coef.whole_image[ci] = new short @@ -3821,7 +3821,7 @@ static int decompress_smooth_data (jpeg_decompress_struct cinfo, byte[][][] outp jpeg_d_coef_controller coef = cinfo.coef; int last_iMCU_row = cinfo.total_iMCU_rows - 1; int block_num, last_block_column; - int ci, block_row, block_rows, access_rows; + int ci, block_row, block_rows; //, access_rows; short[][][] buffer; short[][] buffer_ptr, prev_block_row, next_block_row; byte[][] output_ptr; @@ -3862,19 +3862,19 @@ static int decompress_smooth_data (jpeg_decompress_struct cinfo, byte[][][] outp /* Count non-dummy DCT block rows in this iMCU row. */ if (cinfo.output_iMCU_row < last_iMCU_row) { block_rows = compptr.v_samp_factor; - access_rows = block_rows * 2; /* this and next iMCU row */ + //access_rows = block_rows * 2; /* this and next iMCU row */ last_row = false; } else { /* NB: can't use last_row_height here; it is input-side-dependent! */ block_rows = (compptr.height_in_blocks % compptr.v_samp_factor); if (block_rows == 0) block_rows = compptr.v_samp_factor; - access_rows = block_rows; /* this iMCU row only */ + //access_rows = block_rows; /* this iMCU row only */ last_row = true; } /* Align the virtual buffer for this component. */ int buffer_offset; if (cinfo.output_iMCU_row > 0) { - access_rows += compptr.v_samp_factor; /* prior iMCU row too */ + //access_rows += compptr.v_samp_factor; /* prior iMCU row too */ buffer = coef.whole_image[ci]; buffer_offset = (cinfo.output_iMCU_row - 1) * compptr.v_samp_factor; buffer_offset += compptr.v_samp_factor; /* point to current iMCU row */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java index 7cff455bce..2f064a3e22 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java @@ -375,7 +375,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { OS.GetObject(hBitmap, BITMAP.sizeof, dibBM); byte[] srcData = img.data; if (source.alpha != -1) { - for (int i = 3, ap=0; i < srcData.length; i+=4, ap++) { + for (int i = 3; i < srcData.length; i+=4) { srcData[i] = (byte)source.alpha; } } else if (source.alphaData != null) { |