Anonymous avatar Anonymous committed 42e24f6

Fixed zip doc bundling. Fixed fill operation for 1bpp surfaces.

Comments (0)

Files changed (4)

 	$(top_srcdir)/src/sdlgfx \
 	$(top_srcdir)/src/sdlimage \
 	$(top_srcdir)/src/sdlmixer \
-	$(top_srcdir)/src/sdlttf
+	$(top_srcdir)/src/sdlttf \
+	$(top_srcdir)/util
 
 all: clean build
 

config/bundle_docs.py

                        os.path.join(alias, 'doc'), False)
         add_directory (zipbundle, os.path.join(root, 'doc'),
                        os.path.join(alias, 'doc'), True)
-        add_directory (zipbundle, os.path.join(root, 'examples'),
-                       os.path.join(alias, 'examples'), True)
         print ("\nFinished: %s\n          %s\n" % (bundle_name, zip_name))
     finally:
         bundle.close()

src/sdl/surface_blit_rgb.c

         Sint32          tmp2;                                           \
                                                                         \
         if (srcbpp == 4 && dstbpp == 4)                                 \
-        {                                                                   \
-            while (height--)                                                \
-            {                                                               \
-                LOOP_UNROLLED4(                                             \
-                {                                                           \
+        {                                                               \
+            while (height--)                                            \
+            {                                                           \
+                LOOP_UNROLLED4(                                         \
+                    {                                                   \
                     GET_RGB_VALS ((*(Uint32*)src), srcfmt, sR, sG, sB, sA); \
                     GET_RGB_VALS ((*(Uint32*)dst), dstfmt, dR, dG, dB, dA); \
                     _blitop;                                            \
-                    CREATE_PIXEL(dst, dR, dG, dB, dA, dstbpp, dstfmt);      \
-                    src += srcbpp;                                          \
-                    dst += dstbpp;                                          \
-                }, n, width);                                               \
-                src += srcskip;                                             \
-                dst += dstskip;                                             \
-            }                                                               \
-            return;                                                         \
-        }                                                                   \
+                    CREATE_PIXEL(dst, dR, dG, dB, dA, dstbpp, dstfmt);  \
+                    src += srcbpp;                                      \
+                    dst += dstbpp;                                      \
+                    }, n, width);                                       \
+                src += srcskip;                                         \
+                dst += dstskip;                                         \
+            }                                                           \
+            return;                                                     \
+        }                                                               \
                                                                         \
         if (srcbpp == 1)                                                \
         {                                                               \

src/sdl/surface_fill.c

                 LOOP_UNROLLED4(                                         \
                 {                                                       \
                     GET_PALETTE_VALS (pixels, fmt, sR, sG, sB, sA);     \
-                    D_BLEND_RGBA_ADD (tmp, cR, cG, cB, cA, sR, sG, sB, sA); \
+                    _fillop;                                            \
                     *pixels = SDL_MapRGBA (fmt, sR, sG, sB, sA);        \
                     pixels += bpp;                                      \
                 }, n, width);                                           \
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.