Change colorspace's number of components to be unsigned

core/include/fpdfapi/fpdf_resource.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
 #include <map>
@@ skipping 417 matching lines @@
  public:
   static CPDF_ColorSpace* GetStockCS(int Family);
 
   static CPDF_ColorSpace* Load(CPDF_Document* pDoc, CPDF_Object* pCSObj);
 
   void ReleaseCS();
 
   int GetBufSize() const;
   FX_FLOAT* CreateBuf();
   void GetDefaultColor(FX_FLOAT* buf) const;
-  int CountComponents() const { return m_nComponents; }
+  FX_DWORD CountComponents() const { return m_nComponents; }
   int GetFamily() const { return m_Family; }
   virtual void GetDefaultValue(int iComponent,
                                FX_FLOAT& value,
                                FX_FLOAT& min,
                                FX_FLOAT& max) const {
     value = 0;
     min = 0;
     max = 1.0f;
   }
 
@@ skipping 55 matching lines @@
   }
   virtual FX_BOOL v_SetCMYK(FX_FLOAT* pBuf,
                             FX_FLOAT c,
                             FX_FLOAT m,
                             FX_FLOAT y,
                             FX_FLOAT k) const {
     return FALSE;
   }
 
   int m_Family;
 

[Tom Sepez, 2016/03/10 19:42:19]

nit: while we're at it, no blank line here, line 516, or line 518.

[Wei Li, 2016/03/10 20:14:41]

Done.

-  int m_nComponents;
+  FX_DWORD m_nComponents;
 
   CPDF_Array* m_pArray;
 
   FX_DWORD m_dwStdConversion;
 };
 class CPDF_Color {
  public:
   CPDF_Color() : m_pCS(NULL), m_pBuffer(NULL) {}
 
   CPDF_Color(int family);
@@ skipping 241 matching lines @@
 
   FX_BOOL m_bInterpolate;
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pOC;
   CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_