More stylistic fixes

This commit is contained in:
Fredrick Brennan 2020-01-31 09:47:15 +08:00
parent aaaa34e119
commit 8a6b8b415c
3 changed files with 3 additions and 6 deletions

View File

@ -874,9 +874,6 @@ semi-transparent, "1" is interpreted as the image's current transparency.'''))
o('background_image_scale', 1.0, option_type=positive_float, long_text=_('''
Only has an effect if :opt:`background_image_layout` is tiling, should be positive.'''))
o('background_image_scale', 1.0, option_type=positive_float, long_text=_('''
Only has an effect if :opt:`background_image_layout` is tiling, should be positive.'''))
o('dynamic_background_opacity', False, long_text=_('''
Allow changing of the :opt:`background_opacity` dynamically, using either keyboard
shortcuts (:sc:`increase_background_opacity` and :sc:`decrease_background_opacity`)

View File

@ -263,8 +263,8 @@ bool png_path_to_bitmap(uint8_t** data, unsigned int* width, unsigned int* heigh
*data = calloc(filesize, sizeof(char));
fseek(fp, 0L, SEEK_SET); // rewind() deprecated on some platforms
size_t r = fread(*data, sizeof(char), filesize, fp);
if (r != filesize) return false;
fclose(fp);
if (r != filesize) return false;
png_read_data d;
memset(&d, 0, sizeof(png_read_data));
inflate_png_inner(&d, *data, filesize);

View File

@ -670,7 +670,7 @@ draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_bu
}
if (num_border_rects) {
bind_vertex_array(vao_idx);
bind_vertex_array(vao_idx);
bind_program(BORDERS_PROGRAM);
if (rect_data_is_dirty) {
size_t sz = sizeof(GLuint) * 5 * num_border_rects;
@ -688,7 +688,7 @@ draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_bu
glUniform3f(border_uniform_locations[BORDER_default_bg], CV3(default_bg));
#undef CV3
glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, num_border_rects);
unbind_vertex_array();
unbind_vertex_array();
unbind_program();
}
glDisable(GL_BLEND);