OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 | 9 |
10 #include "SkDisplayType.h" | 10 #include "SkDisplayType.h" |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 } | 365 } |
366 return NULL; | 366 return NULL; |
367 } | 367 } |
368 if (infoCountPtr) | 368 if (infoCountPtr) |
369 *infoCountPtr = infoCount; | 369 *infoCountPtr = infoCount; |
370 return info; | 370 return info; |
371 } | 371 } |
372 | 372 |
373 const SkMemberInfo* SkDisplayType::GetMember(SkAnimateMaker* maker, | 373 const SkMemberInfo* SkDisplayType::GetMember(SkAnimateMaker* maker, |
374 SkDisplayTypes type, const char** matchPtr ) { | 374 SkDisplayTypes type, const char** matchPtr ) { |
375 int infoCount; | 375 int infoCount = 0; // Initialize to remove a warning. |
376 const SkMemberInfo* info = GetMembers(maker, type, &infoCount); | 376 const SkMemberInfo* info = GetMembers(maker, type, &infoCount); |
377 info = SkMemberInfo::Find(info, infoCount, matchPtr); | 377 info = SkMemberInfo::Find(info, infoCount, matchPtr); |
378 // SkASSERT(info); | 378 // SkASSERT(info); |
379 return info; | 379 return info; |
380 } | 380 } |
381 | 381 |
382 #undef CASE_GET_INFO | 382 #undef CASE_GET_INFO |
383 #undef CASE_GET_DRAW_INFO | 383 #undef CASE_GET_DRAW_INFO |
384 #undef CASE_GET_DISPLAY_INFO | 384 #undef CASE_GET_DISPLAY_INFO |
385 | 385 |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
757 continue; | 757 continue; |
758 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0); | 758 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0); |
759 } | 759 } |
760 #endif | 760 #endif |
761 } | 761 } |
762 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED | 762 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED |
763 BuildCondensedInfo(maker); | 763 BuildCondensedInfo(maker); |
764 #endif | 764 #endif |
765 } | 765 } |
766 #endif | 766 #endif |
OLD | NEW |