Merge pull request #20 from andrewcorrigan/master

stdio.h

src/nanovg_gl2.h

@@ -55,6 +55,7 @@ void nvgDeleteGL2(struct NVGcontext* ctx);
 #ifdef NANOVG_GL2_IMPLEMENTATION
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include "nanovg.h"
 

src/nanovg_gl3.h

@@ -54,6 +54,7 @@ void nvgDeleteGL3(struct NVGcontext* ctx);
 #ifdef NANOVG_GL3_IMPLEMENTATION
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include "nanovg.h"
 

src/stb_image.c

@@ -1733,7 +1733,7 @@ static uint8 *resample_row_generic(uint8 *out, uint8 *in_near, uint8 *in_far, in
 {
    // resample with nearest-neighbor
    int i,j;
-   in_far = in_far;
+   (void)in_far;
    for (i=0; i < w; ++i)
       for (j=0; j < hs; ++j)
          out[i*hs+j] = in_near[i];